Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 868d2a1

Browse files
committed
Roll ICU to c2a4cae
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: flutter/flutter#70370
1 parent e06f106 commit 868d2a1

File tree

6 files changed

+24351
-188
lines changed

6 files changed

+24351
-188
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ deps = {
143143
Var('chromium_git') + '/chromium/src/ios.git' + '@' + Var('ios_tools_revision'),
144144

145145
'src/third_party/icu':
146-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '715ec351c0bcdd6b2d22f36e7d33b8e2ec519846',
146+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'c2a4cae149aae7fd30c4cbe3cf1b30df03b386f1',
147147

148148
'src/third_party/khronos':
149149
Var('chromium_git') + '/chromium/src/third_party/khronos.git' + '@' + '7122230e90547962e0f0c627f62eeed3c701f275',

ci/licenses_golden/licenses_third_party

Lines changed: 41 additions & 184 deletions
Large diffs are not rendered by default.

ci/licenses_golden/licenses_third_party.orig

Lines changed: 24302 additions & 0 deletions
Large diffs are not rendered by default.

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: cb6e21d8ae26cdf8275f83c4efaa3fcc
1+
Signature: 1f9d73861a9bb353a12cfa2ba38f6a12
22

third_party/txt/src/minikin/FontLanguageListCache.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ static size_t toLanguageTag(char* output,
7070
}
7171

7272
uErr = U_ZERO_ERROR;
73-
outLength = uloc_toLanguageTag(likelyChars, output, outSize, FALSE, &uErr);
73+
outLength =
74+
uloc_toLanguageTag(likelyChars, output, outSize, /*false*/ 0, &uErr);
7475
if (U_FAILURE(uErr)) {
7576
// unable to build a proper language identifier
7677
ALOGD("uloc_toLanguageTag(\"%s\") failed: %s", likelyChars,

tools/licenses/lib/main.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,18 @@ abstract class _RepositoryLicensedFile extends _RepositoryFile {
5555
static final RegExp _readmeNamePattern = RegExp(r'\b_*(?:readme|contributing|patents)_*\b', caseSensitive: false);
5656
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);
5757
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);
58-
static final RegExp _devPattern = RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml|\.cirrus\.yml)$', caseSensitive: false);
58+
static final RegExp _devPattern = RegExp(r'^(?:codereview\.settings|.+\.~|.+\.~[0-9]+~|\.clang-format|\.gitattributes|\.landmines|\.DS_Store|\.travis\.yml|\.cirrus\.yml|\.cache)$', caseSensitive: false);
5959
static final RegExp _testsPattern = RegExp(r'^(?:tj(?:bench|example)test\.(?:java\.)?in|example\.c)$', caseSensitive: false);
60+
// The ICU library has sample code that will never get linked.
61+
static final RegExp _icuSamplesPattern = RegExp(r'.*(?:icu\/source\/samples).*$', caseSensitive: false);
6062

6163
bool get isIncludedInBuildProducts {
6264
return !io.name.contains(_readmeNamePattern)
6365
&& !io.name.contains(_buildTimePattern)
6466
&& !io.name.contains(_docsPattern)
6567
&& !io.name.contains(_devPattern)
6668
&& !io.name.contains(_testsPattern)
69+
&& !io.toString().contains(_icuSamplesPattern)
6770
&& !isShellScript;
6871
}
6972

0 commit comments

Comments
 (0)