From 06414a67252e77051f154d807419a08ffc09f2aa Mon Sep 17 00:00:00 2001 From: Filip Filmar Date: Mon, 1 Jul 2024 11:38:55 -0700 Subject: [PATCH] [icu] Ignores the dir `flutter/third_party/icu/patches` (flutter/engine#53667) This directory consistes of patches that Chromium's maintainers of the Chromium ICU fork have already applied to the ICU source code. Usually these are fix-forwards that have been applied to the ICU library after it has been released. The patch files are kept to ensure that the patches are applied if we ever need to create a new branch, or update the major ICU version. The patch files specifically do *not* get used during the build process. Issues: https://github.com/flutter/flutter/issues/151116 [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style --- .../src/flutter/ci/licenses_golden/excluded_files | 1 + .../flutter/ci/licenses_golden/licenses_flutter | 15 --------------- .../src/flutter/ci/licenses_golden/tool_signature | 2 +- engine/src/flutter/tools/licenses/lib/paths.dart | 1 + 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index 6420aa3a94..ac3662a46a 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -1934,6 +1934,7 @@ ../../../flutter/third_party/icu/fuzzers ../../../flutter/third_party/icu/icu4c.css ../../../flutter/third_party/icu/license.html +../../../flutter/third_party/icu/patches ../../../flutter/third_party/icu/readme.html ../../../flutter/third_party/icu/scripts ../../../flutter/third_party/icu/source/.clang-format diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index 70cbd7942e..aa5e92a36b 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -57865,21 +57865,6 @@ FILE: ../../../flutter/third_party/icu/flutter/brkitr.patch FILE: ../../../flutter/third_party/icu/flutter/icudtl.dat FILE: ../../../flutter/third_party/icu/flutter_desktop/icudtl.dat FILE: ../../../flutter/third_party/icu/ios/icudtl.dat -FILE: ../../../flutter/third_party/icu/patches/ardatepattern.patch -FILE: ../../../flutter/third_party/icu/patches/atomic_template_instantiation.patch -FILE: ../../../flutter/third_party/icu/patches/cjdict.patch -FILE: ../../../flutter/third_party/icu/patches/configure.patch -FILE: ../../../flutter/third_party/icu/patches/data_symb.patch -FILE: ../../../flutter/third_party/icu/patches/fuchsia.patch -FILE: ../../../flutter/third_party/icu/patches/gb_table.patch -FILE: ../../../flutter/third_party/icu/patches/iso2022jp.patch -FILE: ../../../flutter/third_party/icu/patches/khmer-dictbe.patch -FILE: ../../../flutter/third_party/icu/patches/locale1.patch -FILE: ../../../flutter/third_party/icu/patches/locale_google.patch -FILE: ../../../flutter/third_party/icu/patches/name_5_langs.patch -FILE: ../../../flutter/third_party/icu/patches/restrace.patch -FILE: ../../../flutter/third_party/icu/patches/revert_realpath.patch -FILE: ../../../flutter/third_party/icu/patches/wordbrk.patch FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-implicithan-icu4x.icu FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-implicithan.icu FILE: ../../../flutter/third_party/icu/source/data/in/coll/ucadata-unihan-icu4x.icu diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index 718ca28d0b..e7af91126d 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 8fcfb02b766e80ce50611b894f3fe047 +Signature: 2670e7ab781a8bc009ac069d3b7d9cb5 diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index c13b87ba00..a1ec54dcc0 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -92,6 +92,7 @@ final Set skippedPaths = { 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/patches', // patches added by Chromium that are already applied to the code base 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',