Shift //third_party/icu to //flutter/third_party (#50924)

For flutter/flutter#67373
flutter · Feb 23, 2024 · c278da6 · c278da6
1 parent ca24520
commit c278da6
Show file tree

Hide file tree

Showing 20 changed files with 33,637 additions and 33,717 deletions.
diff --git a/DEPS b/DEPS
@@ -304,7 +304,7 @@ deps = {
   'src/flutter/third_party/flatbuffers':
    Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '0a80646371179f8a7a5c1f42c31ee1d44dcf6709',
 
-  'src/third_party/icu':
+  'src/flutter/third_party/icu':
    Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a622de35ac311c5ad390a7af80724634e5dc61ed',
 
    'src/flutter/third_party/gtest-parallel':

diff --git a/build/archives/BUILD.gn b/build/archives/BUILD.gn
@@ -72,7 +72,7 @@ if (build_engine_artifacts && !is_android) {
       }
       files += [
         {
-          source = "//third_party/icu/flutter/icudtl.dat"
+          source = "//flutter/third_party/icu/flutter/icudtl.dat"
           destination = "icudtl.dat"
         },
         {

diff --git a/build/secondary/third_party/icu/BUILD.gn b/build/secondary/third_party/icu/BUILD.gn
@@ -0,0 +1,19 @@
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+group("icui18n_hidden_visibility") {
+  public_deps = [ "//flutter/third_party/icu:icui18n_hidden_visibility" ]
+}
+
+group("icuuc_hidden_visibility") {
+  public_deps = [ "//flutter/third_party/icu:icuuc_hidden_visibility" ]
+}
+
+group("icui18n") {
+  public_deps = [ "//flutter/third_party/icu:icui18n" ]
+}
+
+group("icuuc") {
+  public_deps = [ "//flutter/third_party/icu:icuuc" ]
+}
diff --git a/ci/licenses.sh b/ci/licenses.sh
@@ -162,7 +162,7 @@ function verify_licenses() (
 
   local actualLicenseCount
   actualLicenseCount="$(tail -n 1 flutter/ci/licenses_golden/licenses_flutter | tr -dc '0-9')"
-  local expectedLicenseCount=319 # When changing this number: Update the error message below as well describing the newly expected license types.
+  local expectedLicenseCount=758 # When changing this number: Update the error message below as well describing the newly expected license types.
 
   if [[ $actualLicenseCount -ne $expectedLicenseCount ]]; then
     echo "=============================== ERROR ==============================="

diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files
diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 49d0673446dde28e2f193b3407a9904e
+Signature: f49b025536bc4384432f8ab917d316cd
 
diff --git a/fml/BUILD.gn b/fml/BUILD.gn
@@ -116,15 +116,15 @@ source_set("fml") {
     "$dart_src/runtime:dart_api",
 
     # These need to be in sync with the Fuchsia buildroot.
-    "//third_party/icu",
+    "//flutter/third_party/icu",
   ]
 
   if (enable_backtrace) {
     # This abseil dependency is only used by backtrace.cc.
     deps += [ "//third_party/abseil-cpp/absl/debugging:symbolize" ]
   }
 
-  configs += [ "//third_party/icu:icu_config" ]
+  configs += [ "//flutter/third_party/icu:icu_config" ]
 
   public_configs = [
     "//flutter:config",

diff --git a/shell/platform/android/BUILD.gn b/shell/platform/android/BUILD.gn
@@ -70,7 +70,7 @@ shared_library("flutter_shell_native") {
 
 bin_to_assembly("icudtl_asm") {
   deps = []
-  input = "//third_party/icu/flutter/icudtl.dat"
+  input = "//flutter/third_party/icu/flutter/icudtl.dat"
   symbol = "_binary_icudtl_dat_start"
   size_symbol = "_binary_icudtl_dat_size"
   executable = false

diff --git a/shell/platform/darwin/ios/BUILD.gn b/shell/platform/darwin/ios/BUILD.gn
@@ -53,7 +53,7 @@ source_set("flutter_framework_source_arc") {
     "//flutter/fml",
     "//flutter/shell/platform/common:common_cpp_input",
     "//flutter/shell/platform/darwin/common:framework_common",
-    "//third_party/icu",
+    "//flutter/third_party/icu",
   ]
   public_configs = [ "//flutter:config" ]
 
@@ -407,7 +407,7 @@ action("copy_framework_headers") {
 
 copy("copy_framework_icu") {
   visibility = [ ":*" ]
-  sources = [ "//third_party/icu/flutter/icudtl.dat" ]
+  sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
   outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ]
 }
 

diff --git a/shell/platform/darwin/macos/BUILD.gn b/shell/platform/darwin/macos/BUILD.gn
@@ -162,7 +162,7 @@ shared_library("flutter_framework_dylib") {
 test_fixtures("flutter_desktop_darwin_fixtures") {
   dart_main = "framework/Source/fixtures/flutter_desktop_test.dart"
 
-  fixtures = [ "//third_party/icu/common/icudtl.dat" ]
+  fixtures = [ "//flutter/third_party/icu/common/icudtl.dat" ]
 }
 
 executable("flutter_desktop_darwin_unittests") {
@@ -259,7 +259,7 @@ action("copy_framework_headers") {
 
 copy("copy_framework_icu") {
   visibility = [ ":*" ]
-  sources = [ "//third_party/icu/flutter/icudtl.dat" ]
+  sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
   outputs =
       [ "$_flutter_framework_dir/Versions/A/Resources/{{source_file_part}}" ]
 }

diff --git a/shell/platform/embedder/BUILD.gn b/shell/platform/embedder/BUILD.gn
@@ -180,7 +180,7 @@ template("embedder_source_set") {
     # Depend on 'icudtl.dat.S' to avoid dynamic lookups of engine library symbols.
     if (is_android) {
       deps += [ "//flutter/shell/platform/android:icudtl_asm" ]
-      sources += [ "$root_build_dir/gen/flutter/shell/platform/android/third_party/icu/flutter/icudtl.dat.S" ]
+      sources += [ "$root_build_dir/gen/flutter/shell/platform/android/flutter/third_party/icu/flutter/icudtl.dat.S" ]
     }
 
     public_configs += [
@@ -459,7 +459,7 @@ if (is_mac && !embedder_for_target) {
 
   copy("copy_icu") {
     visibility = [ ":*" ]
-    sources = [ "//third_party/icu/flutter/icudtl.dat" ]
+    sources = [ "//flutter/third_party/icu/flutter/icudtl.dat" ]
     outputs =
         [ "$_flutter_embedder_framework_dir/Versions/A/Resources/icudtl.dat" ]
   }

diff --git a/shell/platform/fuchsia/flutter/BUILD.gn b/shell/platform/fuchsia/flutter/BUILD.gn
@@ -321,7 +321,7 @@ template("jit_runner") {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -392,7 +392,7 @@ template("aot_runner") {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -592,7 +592,7 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -605,7 +605,7 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
       {
@@ -633,7 +633,7 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
     ]
@@ -766,11 +766,11 @@ if (enable_unittests) {
 
     resources = [
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl.dat"
       },
       {
-        path = rebase_path("//third_party/icu/common/icudtl.dat")
+        path = rebase_path("//flutter/third_party/icu/common/icudtl.dat")
         dest = "icudtl2.dat"
       },
     ]

diff --git a/skia/modules/skunicode/BUILD.gn b/skia/modules/skunicode/BUILD.gn
@@ -45,10 +45,10 @@ if (skia_use_icu || skia_use_client_icu || skia_use_libgrapheme) {
       # only available for Android at the moment
       if (skia_use_runtime_icu && (is_android || is_linux)) {
         sources += skia_unicode_runtime_icu_sources
-        deps += [ "//third_party/icu:headers" ]
+        deps += [ "//flutter/third_party/icu:headers" ]
       } else {
         sources += skia_unicode_builtin_icu_sources
-        deps += [ "//third_party/icu" ]
+        deps += [ "//flutter/third_party/icu" ]
       }
       configs += [ "$_skia_root/third_party/icu/config:no_cxx" ]
     }

diff --git a/third_party/accessibility/ax/BUILD.gn b/third_party/accessibility/ax/BUILD.gn
@@ -108,7 +108,7 @@ source_set("ax") {
     ]
     deps = [
       "//flutter/fml:fml",
-      "//third_party/icu:icui18n",
+      "//flutter/third_party/icu:icui18n",
     ]
   }
 

diff --git a/third_party/canvaskit/icu_bidi/BUILD.gn b/third_party/canvaskit/icu_bidi/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 public_include_dirs = [
-  "//third_party/icu/source/common",
-  "//third_party/icu/source/i18n",
+  "//flutter/third_party/icu/source/common",
+  "//flutter/third_party/icu/source/i18n",
 ]
 
 config("icu_bidi_public") {
@@ -34,20 +34,20 @@ static_library("icu_bidi") {
     "U_I18N_IMPLEMENTATION",
   ]
   sources = [
-    "//third_party/icu/source/common/cmemory.cpp",
-    "//third_party/icu/source/common/cstring.cpp",
-    "//third_party/icu/source/common/ubidi.cpp",
-    "//third_party/icu/source/common/ubidi_props.cpp",
-    "//third_party/icu/source/common/ubidiln.cpp",
-    "//third_party/icu/source/common/ubidiwrt.cpp",
-    "//third_party/icu/source/common/uchar.cpp",
-    "//third_party/icu/source/common/udataswp.cpp",
-    "//third_party/icu/source/common/uinvchar.cpp",
-    "//third_party/icu/source/common/ustring.cpp",
-    "//third_party/icu/source/common/ustrtrns.cpp",
-    "//third_party/icu/source/common/utf_impl.cpp",
-    "//third_party/icu/source/common/utrie2.cpp",
-    "//third_party/icu/source/common/utypes.cpp",
+    "//flutter/third_party/icu/source/common/cmemory.cpp",
+    "//flutter/third_party/icu/source/common/cstring.cpp",
+    "//flutter/third_party/icu/source/common/ubidi.cpp",
+    "//flutter/third_party/icu/source/common/ubidi_props.cpp",
+    "//flutter/third_party/icu/source/common/ubidiln.cpp",
+    "//flutter/third_party/icu/source/common/ubidiwrt.cpp",
+    "//flutter/third_party/icu/source/common/uchar.cpp",
+    "//flutter/third_party/icu/source/common/udataswp.cpp",
+    "//flutter/third_party/icu/source/common/uinvchar.cpp",
+    "//flutter/third_party/icu/source/common/ustring.cpp",
+    "//flutter/third_party/icu/source/common/ustrtrns.cpp",
+    "//flutter/third_party/icu/source/common/utf_impl.cpp",
+    "//flutter/third_party/icu/source/common/utrie2.cpp",
+    "//flutter/third_party/icu/source/common/utypes.cpp",
   ]
   public_configs = [ ":icu_bidi_public" ]
   cflags = [ "-w" ]

diff --git a/third_party/txt/BUILD.gn b/third_party/txt/BUILD.gn
@@ -84,7 +84,7 @@ source_set("txt") {
     "//flutter/impeller/typographer/backends/skia:typographer_skia_backend",
     "//flutter/skia",
     "//flutter/third_party/harfbuzz",
-    "//third_party/icu",
+    "//flutter/third_party/icu",
   ]
 
   deps = [

diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
@@ -992,6 +992,7 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
   static const Map<String, _Constructor> _specialCaseFiles = <String, _Constructor>{
     '/flutter/third_party/boringssl/src/LICENSE': _RepositoryOpenSSLLicenseFile.new,
     '/flutter/third_party/freetype2/LICENSE.TXT': _RepositoryFreetypeLicenseFile.new,
+    '/flutter/third_party/icu/LICENSE': _RepositoryIcuLicenseFile.new,
     '/flutter/third_party/inja/third_party/include/nlohmann/json.hpp': _RepositoryInjaJsonFile.new,
     '/flutter/third_party/libjpeg-turbo/src/LICENSE': _RepositoryLibJpegTurboLicenseFile.new,
     '/flutter/third_party/libjpeg-turbo/src/README.ijg': _RepositoryReadmeIjgFile.new,
@@ -1001,7 +1002,6 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
     '/fuchsia/sdk/linux/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/fuchsia/sdk/mac/LICENSE.vulkan': _RepositoryFuchsiaSdkLinuxLicenseFile.new,
     '/third_party/dart/LICENSE': _RepositoryDartLicenseFile.new,
-    '/third_party/icu/LICENSE': _RepositoryIcuLicenseFile.new,
     '/third_party/khronos/LICENSE': _RepositoryKhronosLicenseFile.new,
     '/third_party/libcxx/LICENSE.TXT': _RepositoryCxxStlDualLicenseFile.new,
     '/third_party/libcxxabi/LICENSE.TXT': _RepositoryCxxStlDualLicenseFile.new,

diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart
@@ -53,6 +53,15 @@ final Set<String> skippedPaths = <String>{
   r'flutter/third_party/gn',
   r'flutter/third_party/harfbuzz/docs',
   r'flutter/third_party/harfbuzz/util', // utils are command line tools that do not end up in the binary
+  r'flutter/third_party/icu/filters',
+  r'flutter/third_party/icu/fuzzers',
+  r'flutter/third_party/icu/scripts',
+  r'flutter/third_party/icu/source/common/unicode/uvernum.h', // this file contains strings that confuse the analysis
+  r'flutter/third_party/icu/source/config',
+  r'flutter/third_party/icu/source/data/brkitr/dictionaries/burmesedict.txt', // explicitly handled by ICU license
+  r'flutter/third_party/icu/source/data/brkitr/dictionaries/cjdict.txt', // explicitly handled by ICU license
+  r'flutter/third_party/icu/source/data/brkitr/dictionaries/laodict.txt', // explicitly handled by ICU license
+  r'flutter/third_party/icu/source/data/dtd',
   r'flutter/third_party/imgui',
   r'flutter/third_party/inja/doc', // documentation
   r'flutter/third_party/inja/third_party/amalgamate', // only used at build time
@@ -161,15 +170,6 @@ final Set<String> skippedPaths = <String>{
   r'third_party/dart/tools', // not shipped in binary
   r'third_party/google_fonts_for_unit_tests', // only used in web unit tests
   r'third_party/gradle',
-  r'third_party/icu/filters',
-  r'third_party/icu/fuzzers',
-  r'third_party/icu/scripts',
-  r'third_party/icu/source/common/unicode/uvernum.h', // this file contains strings that confuse the analysis
-  r'third_party/icu/source/config',
-  r'third_party/icu/source/data/brkitr/dictionaries/burmesedict.txt', // explicitly handled by ICU license
-  r'third_party/icu/source/data/brkitr/dictionaries/cjdict.txt', // explicitly handled by ICU license
-  r'third_party/icu/source/data/brkitr/dictionaries/laodict.txt', // explicitly handled by ICU license
-  r'third_party/icu/source/data/dtd',
   r'third_party/java', // only used for Android builds
   r'third_party/libcxx/benchmarks',
   r'third_party/libcxx/docs',
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		Signature: 49d0673446dde28e2f193b3407a9904e
		Signature: f49b025536bc4384432f8ab917d316cd