From d212baa4e8346803bb2a63eff0fc7f6f154f4fef Mon Sep 17 00:00:00 2001 From: Jackson Gardner Date: Fri, 8 Mar 2024 14:41:26 -0800 Subject: [PATCH 1/3] Move emscripten out of the buildroot into the flutter repo. --- DEPS | 16 +++------------- ci/licenses_golden/excluded_files | 2 +- lib/web_ui/dev/roll_fallback_fonts.dart | 2 +- lib/web_ui/dev/steps/copy_artifacts_step.dart | 1 + tools/activate_emsdk.py | 2 +- tools/licenses/lib/paths.dart | 2 +- 6 files changed, 8 insertions(+), 17 deletions(-) diff --git a/DEPS b/DEPS index 102bf40e0fe87..a152d9c04b428 100644 --- a/DEPS +++ b/DEPS @@ -283,7 +283,7 @@ allowed_hosts = [ ] deps = { - 'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ef514ca5144ba0a4ce5e7075c325d24cd6da73a4', + 'src': 'https://github.com/flutter/buildroot.git' + '@' + '9d0eeac311fa73dcefc1e3afb67330f1b3465383', 'src/flutter/third_party/depot_tools': Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7', @@ -789,16 +789,6 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/web_dependencies': { - 'packages': [ - { - 'package': 'flutter/web/canvaskit_bundle', - 'version': Var('canvaskit_cipd_instance') - } - ], - 'dep_type': 'cipd', - }, - 'src/third_party/java/openjdk': { 'packages': [ { @@ -829,7 +819,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/emsdk': { + 'src/flutter/prebuilts/emsdk': { 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'a896e3d066448b3530dbcaa48869fafefd738f57', 'condition': 'download_emsdk', }, @@ -1055,7 +1045,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/third_party/google_fonts_for_unit_tests': { + 'src/flutter/third_party/google_fonts_for_unit_tests': { 'packages': [ { 'package': 'flutter/flutter_font_fallbacks', diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index d26f7912ea951..c58556b23284b 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -1539,6 +1539,7 @@ ../../../flutter/third_party/glfw/src/CMakeLists.txt ../../../flutter/third_party/glfw/tests ../../../flutter/third_party/gn +../../../flutter/third_party/google_fonts_for_unit_tests ../../../flutter/third_party/googletest ../../../flutter/third_party/gtest-parallel/.git ../../../flutter/third_party/gtest-parallel/.gitignore @@ -3128,7 +3129,6 @@ ../../../third_party/dart/utils/OWNERS ../../../third_party/dart/utils/compiler/.gitignore ../../../third_party/dart/utils/dartanalyzer/.gitignore -../../../third_party/google_fonts_for_unit_tests ../../../third_party/gradle ../../../third_party/java ../../../third_party/libcxx/.clang-format diff --git a/lib/web_ui/dev/roll_fallback_fonts.dart b/lib/web_ui/dev/roll_fallback_fonts.dart index a281138009fda..5981e28d627ef 100644 --- a/lib/web_ui/dev/roll_fallback_fonts.dart +++ b/lib/web_ui/dev/roll_fallback_fonts.dart @@ -323,7 +323,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE. ); await runProcess('gclient', [ 'setdep', - '--revision=src/third_party/google_fonts_for_unit_tests:$packageName@$versionString', + '--revision=src/flutter/third_party/google_fonts_for_unit_tests:$packageName@$versionString', '--deps-file=$depFilePath' ]); } diff --git a/lib/web_ui/dev/steps/copy_artifacts_step.dart b/lib/web_ui/dev/steps/copy_artifacts_step.dart index b02f6f49e4c8b..7c7293bbd5fc6 100644 --- a/lib/web_ui/dev/steps/copy_artifacts_step.dart +++ b/lib/web_ui/dev/steps/copy_artifacts_step.dart @@ -105,6 +105,7 @@ class CopyArtifactsStep implements PipelineStep { final io.Directory fallbackFontsSource = io.Directory(pathlib.join( environment.engineSrcDir.path, + 'flutter', 'third_party', 'google_fonts_for_unit_tests', )); diff --git a/tools/activate_emsdk.py b/tools/activate_emsdk.py index 11d0f302dd64b..64219942a4a97 100644 --- a/tools/activate_emsdk.py +++ b/tools/activate_emsdk.py @@ -9,7 +9,7 @@ import subprocess import sys -EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'buildtools', 'emsdk')) +EMSDK_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'prebuilts', 'emsdk')) EMSDK_PATH = os.path.join(EMSDK_ROOT, 'emsdk.py') diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart index 4f40ef3c8ef06..1c7ae072ac737 100644 --- a/tools/licenses/lib/paths.dart +++ b/tools/licenses/lib/paths.dart @@ -63,6 +63,7 @@ final Set skippedPaths = { r'flutter/third_party/glfw/deps', // Only used by examples and tests; not linked in build. r'flutter/third_party/glfw/docs', r'flutter/third_party/gn', + r'flutter/third_party/google_fonts_for_unit_tests', // only used in web unit tests 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', @@ -198,7 +199,6 @@ final Set skippedPaths = { r'third_party/dart/third_party/pkg_tested', r'third_party/dart/third_party/requirejs', // only used by DDC 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/java', // only used for Android builds r'third_party/libcxx/benchmarks', From ffb8aeb72db92c96a9c00c14e74206d51f31246d Mon Sep 17 00:00:00 2001 From: Jackson Gardner Date: Fri, 8 Mar 2024 15:21:11 -0800 Subject: [PATCH 2/3] Remove `web_dependencies` from the licenses excluded files. --- ci/licenses_golden/excluded_files | 1 - tools/licenses/lib/paths.dart | 1 - 2 files changed, 2 deletions(-) diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index c58556b23284b..4aa940f3de2a7 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -3308,7 +3308,6 @@ ../../../third_party/perfetto/ui/src/plugins/dev.perfetto.AndroidPerf/OWNERS ../../../third_party/perfetto/ui/src/plugins/dev.perfetto.LargeScreensPerf/OWNERS ../../../third_party/perfetto/ui/src/test -../../../third_party/web_dependencies/canvaskit ../../../third_party/zlib/.git ../../../third_party/zlib/CMakeLists.txt ../../../third_party/zlib/DIR_METADATA diff --git a/tools/licenses/lib/paths.dart b/tools/licenses/lib/paths.dart index 1c7ae072ac737..c3bcb0f65341d 100644 --- a/tools/licenses/lib/paths.dart +++ b/tools/licenses/lib/paths.dart @@ -217,7 +217,6 @@ final Set skippedPaths = { r'third_party/perfetto/src/trace_processor', // contains nothing that ends up in the binary executable r'third_party/perfetto/src/traced', // contains nothing that ends up in the binary executable r'third_party/perfetto/src/tracing', // contains nothing that ends up in the binary executable - r'third_party/web_dependencies/canvaskit', // redundant; covered by Skia dependencies r'third_party/zlib/contrib/minizip/miniunz.c', // sample file r'third_party/zlib/contrib/minizip/minizip.c', // sample file r'tools', // not distributed in binary From cb24a337518c0b5499c1b551c2f9de99be1649bb Mon Sep 17 00:00:00 2001 From: Jackson Gardner Date: Fri, 8 Mar 2024 15:40:31 -0800 Subject: [PATCH 3/3] Update tool signature. --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 375dde35c83ce..15d63ed8664ed 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 6d4a7215ee5679ace5ae272f414246bb +Signature: 46b0db75dff939f8b39145a50f827d47