未验证 提交 8bb47c54 编写于 作者: F Filip Filmar 提交者: GitHub

Roll ICU to c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1 (#22465)

Changes to make this work:

- Had to change the use of an UBool constant `FALSE` to 0 because
  the file referring to it does not include the respective header.

- Had to change the license checker to ignore files in the directory
  icu/source/samples.  There were random changes to the licensing
  headers which tripped up license checks.  And since we don't include
  samples in the binaries we build, the most efficient way to fix it is
  to exclude sample code from license checks.

Issue: https://github.com/flutter/flutter/issues/70370
上级 2004a7b3
......@@ -143,7 +143,7 @@ deps = {
Var('chromium_git') + '/chromium/src/ios.git' + '@' + Var('ios_tools_revision'),
'src/third_party/icu':
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '715ec351c0bcdd6b2d22f36e7d33b8e2ec519846',
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1',
'src/third_party/khronos':
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',
......
Signature: cb6e21d8ae26cdf8275f83c4efaa3fcc
Signature: 1f9d73861a9bb353a12cfa2ba38f6a12
......@@ -70,7 +70,8 @@ static size_t toLanguageTag(char* output,
}
uErr = U_ZERO_ERROR;
outLength = uloc_toLanguageTag(likelyChars, output, outSize, FALSE, &uErr);
outLength =
uloc_toLanguageTag(likelyChars, output, outSize, /*false*/ 0, &uErr);
if (U_FAILURE(uErr)) {
// unable to build a proper language identifier
ALOGD("uloc_toLanguageTag(\"%s\") failed: %s", likelyChars,
......
......@@ -55,8 +55,10 @@ abstract class _RepositoryLicensedFile extends _RepositoryFile {
static final RegExp _readmeNamePattern = RegExp(r'\b_*(?:readme|contributing|patents)_*\b', caseSensitive: false);
static final RegExp _buildTimePattern = RegExp(r'^(?!.*gen$)(?:CMakeLists\.txt|(?:pkgdata)?Makefile(?:\.inc)?(?:\.am|\.in|)|configure(?:\.ac|\.in)?|config\.(?:sub|guess)|.+\.m4|install-sh|.+\.sh|.+\.bat|.+\.pyc?|.+\.pl|icu-configure|.+\.gypi?|.*\.gni?|.+\.mk|.+\.cmake|.+\.gradle|.+\.yaml|pubspec\.lock|\.packages|vms_make\.com|pom\.xml|\.project|source\.properties|.+\.obj|.+\.autopkg)$', caseSensitive: false);
static final RegExp _docsPattern = RegExp(r'^(?:INSTALL|NEWS|OWNERS|AUTHORS|ChangeLog(?:\.rst|\.[0-9]+)?|.+\.txt|.+\.md|.+\.log|.+\.css|.+\.1|doxygen\.config|Doxyfile|.+\.spec(?:\.in)?)$', caseSensitive: false);
static final RegExp _devPattern = RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml|\.cirrus\.yml)$', caseSensitive: false);
static final RegExp _devPattern = RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml|\.cirrus\.yml|\.cache)$', caseSensitive: false);
static final RegExp _testsPattern = RegExp(r'^(?:tj(?:bench|example)test\.(?:java\.)?in|example\.c)$', caseSensitive: false);
// The ICU library has sample code that will never get linked.
static final RegExp _icuSamplesPattern = RegExp(r'.*(?:icu\/source\/samples).*$', caseSensitive: false);
bool get isIncludedInBuildProducts {
return !io.name.contains(_readmeNamePattern)
......@@ -64,6 +66,7 @@ abstract class _RepositoryLicensedFile extends _RepositoryFile {
&& !io.name.contains(_docsPattern)
&& !io.name.contains(_devPattern)
&& !io.name.contains(_testsPattern)
&& !io.toString().contains(_icuSamplesPattern)
&& !isShellScript;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册