From 762d37fd2ebdee79602429ce4d37f6f8edba602c Mon Sep 17 00:00:00 2001 From: Jason Simmons Date: Thu, 21 Mar 2024 10:06:44 -0700 Subject: [PATCH] Move //buildtools to //flutter/buildtools (flutter/engine#51526) --- DEPS | 38 +++++++++---------- engine/src/flutter/.gitignore | 3 ++ engine/src/flutter/build/copy_info_plist.py | 2 +- engine/src/flutter/ci/bin/format.dart | 1 + engine/src/flutter/ci/clang_tidy.sh | 2 +- .../flutter/ci/licenses_golden/excluded_files | 2 +- .../flutter/ci/licenses_golden/tool_signature | 2 +- .../shell/platform/darwin/ios/BUILD.gn | 3 +- .../runtime/dart/profiler_symbols/BUILD.gn | 3 +- .../sky/tools/create_embedder_framework.py | 3 +- .../sky/tools/create_full_ios_framework.py | 3 +- .../flutter/sky/tools/create_ios_framework.py | 3 +- .../sky/tools/create_macos_framework.py | 3 +- .../flutter/testing/sanitizer_suppressions.sh | 4 +- .../testing/symbols/verify_exported.dart | 2 +- .../test/header_filter_regex_test.dart | 1 + engine/src/flutter/tools/dia_dll.py | 4 +- engine/src/flutter/tools/fuchsia/clang.gni | 4 +- .../tools/fuchsia/fuchsia_debug_symbols.gni | 4 +- engine/src/flutter/tools/gn | 8 +++- .../lib/header_guard_check.dart | 1 + .../src/flutter/tools/licenses/lib/paths.dart | 1 + .../lib/src/build_config_runner.dart | 2 +- 23 files changed, 55 insertions(+), 44 deletions(-) diff --git a/DEPS b/DEPS index 8cf829fe6a9..3479e1a1127 100644 --- a/DEPS +++ b/DEPS @@ -842,7 +842,7 @@ deps = { # Clang on mac and linux are expected to typically be the same revision. # They are separated out so that the autoroller can more easily manage them. - 'src/buildtools/mac-x64/clang': { + 'src/flutter/buildtools/mac-x64/clang': { 'packages': [ { 'package': 'fuchsia/third_party/clang/mac-amd64', @@ -853,7 +853,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/mac-arm64/clang': { + 'src/flutter/buildtools/mac-arm64/clang': { 'packages': [ { 'package': 'fuchsia/third_party/clang/mac-arm64', @@ -864,7 +864,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/linux-x64/clang': { + 'src/flutter/buildtools/linux-x64/clang': { 'packages': [ { 'package': 'fuchsia/third_party/clang/linux-amd64', @@ -875,7 +875,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/linux-arm64/clang': { + 'src/flutter/buildtools/linux-arm64/clang': { 'packages': [ { 'package': 'fuchsia/third_party/clang/linux-arm64', @@ -886,7 +886,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/windows-x64/clang': { + 'src/flutter/buildtools/windows-x64/clang': { 'packages': [ { 'package': 'fuchsia/third_party/clang/windows-amd64', @@ -898,7 +898,7 @@ deps = { }, # GOMA - 'src/buildtools/mac-x64/goma': { + 'src/flutter/buildtools/mac-x64/goma': { 'packages': [ { 'package': 'fuchsia/third_party/goma/client/mac-amd64', @@ -909,7 +909,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/linux-x64/goma': { + 'src/flutter/buildtools/linux-x64/goma': { 'packages': [ { 'package': 'fuchsia/third_party/goma/client/linux-amd64', @@ -920,7 +920,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/windows-x64/goma': { + 'src/flutter/buildtools/windows-x64/goma': { 'packages': [ { 'package': 'fuchsia/third_party/goma/client/windows-amd64', @@ -932,7 +932,7 @@ deps = { }, # RBE binaries and configs. - 'src/buildtools/linux-x64/reclient': { + 'src/flutter/buildtools/linux-x64/reclient': { 'packages': [ { 'package': 'infra/rbe/client/${{platform}}', @@ -943,7 +943,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/mac-arm64/reclient': { + 'src/flutter/buildtools/mac-arm64/reclient': { 'packages': [ { 'package': 'infra/rbe/client/${{platform}}', @@ -954,7 +954,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/mac-x64/reclient': { + 'src/flutter/buildtools/mac-x64/reclient': { 'packages': [ { 'package': 'infra/rbe/client/${{platform}}', @@ -965,7 +965,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/windows-x64/reclient': { + 'src/flutter/buildtools/windows-x64/reclient': { 'packages': [ { 'package': 'infra/rbe/client/${{platform}}', @@ -980,7 +980,7 @@ deps = { 'packages': [ { 'package': 'flutter_internal/rbe/reclient_cfgs', - 'version': 'PKYzmgx_GlWBAq7PEphD7bsfZ55WSOifmWisD0N-4e4C', + 'version': 'ZuU_165luvP45DTYUP6WlEXb5EXyVxEuAm45ZB1c3zoC', } ], 'condition': 'use_rbe', @@ -988,7 +988,7 @@ deps = { }, # gcloud - 'src/buildtools/linux-x64/gcloud': { + 'src/flutter/buildtools/linux-x64/gcloud': { 'packages': [ { 'package': 'infra/3pp/tools/gcloud/${{platform}}', @@ -999,7 +999,7 @@ deps = { 'dep_type': 'cipd', }, - 'src/buildtools/mac-arm64/gcloud': { + 'src/flutter/buildtools/mac-arm64/gcloud': { 'packages': [ { 'package': 'infra/3pp/tools/gcloud/${{platform}}', @@ -1051,7 +1051,7 @@ deps = { }, # cmake is only used by impeller-cmake-example. - 'src/buildtools/mac-x64/cmake': { + 'src/flutter/buildtools/mac-x64/cmake': { 'packages': [ { 'package': 'infra/3pp/tools/cmake/mac-amd64', @@ -1162,7 +1162,7 @@ hooks = [ 'condition': 'use_cipd_goma and host_os == "mac"', 'action': [ 'python3', - 'src/buildtools/mac-x64/goma/goma_ctl.py', + 'src/flutter/buildtools/mac-x64/goma/goma_ctl.py', 'ensure_start' ] }, @@ -1172,7 +1172,7 @@ hooks = [ 'condition': 'use_cipd_goma and host_os == "linux"', 'action': [ 'python3', - 'src/buildtools/linux-x64/goma/goma_ctl.py', + 'src/flutter/buildtools/linux-x64/goma/goma_ctl.py', 'ensure_start' ] }, @@ -1182,7 +1182,7 @@ hooks = [ 'condition': 'use_cipd_goma and download_windows_deps', 'action': [ 'python3', - 'src/buildtools/windows-x64/goma/goma_ctl.py', + 'src/flutter/buildtools/windows-x64/goma/goma_ctl.py', 'ensure_start' ] }, diff --git a/engine/src/flutter/.gitignore b/engine/src/flutter/.gitignore index aa52914644c..10440a5444a 100644 --- a/engine/src/flutter/.gitignore +++ b/engine/src/flutter/.gitignore @@ -134,6 +134,9 @@ app.*.symbols # GN build support for protobufs vended by Fuchsia. # /build/secondary/third_party/protobuf +# Build tools vended from CIPD +/buildtools + # RBE support configurations and scripts vended from CIPD /build/rbe diff --git a/engine/src/flutter/build/copy_info_plist.py b/engine/src/flutter/build/copy_info_plist.py index 982dfe6eec3..d812edacf06 100644 --- a/engine/src/flutter/build/copy_info_plist.py +++ b/engine/src/flutter/build/copy_info_plist.py @@ -23,7 +23,7 @@ import git_revision def get_clang_version(): clang_executable = str( - os.path.join('..', '..', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++') + os.path.join('..', '..', 'flutter', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++') ) version = subprocess.check_output([clang_executable, '--version']) return version.splitlines()[0] diff --git a/engine/src/flutter/ci/bin/format.dart b/engine/src/flutter/ci/bin/format.dart index a9aee80493c..49f019f7b2c 100644 --- a/engine/src/flutter/ci/bin/format.dart +++ b/engine/src/flutter/ci/bin/format.dart @@ -326,6 +326,7 @@ class ClangFormatChecker extends FormatChecker { clangFormat = File( path.join( srcDir.absolute.path, + 'flutter', 'buildtools', clangOs, 'clang', diff --git a/engine/src/flutter/ci/clang_tidy.sh b/engine/src/flutter/ci/clang_tidy.sh index ec47288716a..aa0c0471d6a 100755 --- a/engine/src/flutter/ci/clang_tidy.sh +++ b/engine/src/flutter/ci/clang_tidy.sh @@ -56,7 +56,7 @@ fi # Determine wether to use x64 or arm64. if command -v arch &> /dev/null && [[ $(arch) == "arm64" ]]; then - CLANG_TIDY_PATH="buildtools/mac-arm64/clang/bin/clang-tidy" + CLANG_TIDY_PATH="flutter/buildtools/mac-arm64/clang/bin/clang-tidy" fi COMPILE_COMMANDS="$SRC_DIR/out/host_debug/compile_commands.json" diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files index f8ede0dd1aa..b59d4960d7f 100644 --- a/engine/src/flutter/ci/licenses_golden/excluded_files +++ b/engine/src/flutter/ci/licenses_golden/excluded_files @@ -9,7 +9,6 @@ ../../../README.md ../../../build ../../../build_overrides -../../../buildtools ../../../flutter/.ci.yaml ../../../flutter/.clang-format ../../../flutter/.clang-tidy @@ -27,6 +26,7 @@ ../../../flutter/analysis_options.yaml ../../../flutter/build ../../../flutter/build_overrides +../../../flutter/buildtools ../../../flutter/ci ../../../flutter/common/README.md ../../../flutter/display_list/benchmarking/dl_complexity_unittests.cc diff --git a/engine/src/flutter/ci/licenses_golden/tool_signature b/engine/src/flutter/ci/licenses_golden/tool_signature index 89511c0d458..7c03df13116 100644 --- a/engine/src/flutter/ci/licenses_golden/tool_signature +++ b/engine/src/flutter/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: 10ea95d73c5e8a92240f014b15634a8c +Signature: ca33ea519500557f75994e39099baaa0 diff --git a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn index 11719a63505..2c8d038e9cc 100644 --- a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn @@ -6,6 +6,7 @@ assert(is_ios) import("//build/config/ios/ios_sdk.gni") import("//build/toolchain/clang.gni") +import("//build/toolchain/toolchain.gni") import("//flutter/common/config.gni") import("//flutter/shell/config.gni") import("//flutter/shell/gpu/gpu.gni") @@ -344,7 +345,7 @@ copy("copy_asan_runtime_dylib") { visibility = [ ":*" ] _libclang_base_path = - "//buildtools/mac-x64/clang/lib/clang/13.0.0/lib/darwin/" + "$buildtools_path/mac-x64/clang/lib/clang/13.0.0/lib/darwin/" if (defined(use_ios_simulator) && use_ios_simulator) { _dylib_name = "libclang_rt.asan_iossim_dynamic.dylib" diff --git a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn index f139ddff98c..61b63713e34 100644 --- a/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn +++ b/engine/src/flutter/shell/platform/fuchsia/runtime/dart/profiler_symbols/BUILD.gn @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/toolchain/toolchain.gni") import("//flutter/build/dart/dart.gni") import("//flutter/tools/fuchsia/clang.gni") @@ -23,7 +24,7 @@ template("generate_dart_profiler_symbols") { args = [ "--nm", - rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin/llvm-nm"), + rebase_path("$buildtools_path/${host_os}-${host_cpu}/clang/bin/llvm-nm"), "--binary", rebase_path(invoker.library_path), "--output", diff --git a/engine/src/flutter/sky/tools/create_embedder_framework.py b/engine/src/flutter/sky/tools/create_embedder_framework.py index ebbccbc3ec5..9178c541020 100755 --- a/engine/src/flutter/sky/tools/create_embedder_framework.py +++ b/engine/src/flutter/sky/tools/create_embedder_framework.py @@ -15,8 +15,7 @@ buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', ' ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', - 'dsymutil' + os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) out_dir = os.path.join(buildroot_dir, 'out') diff --git a/engine/src/flutter/sky/tools/create_full_ios_framework.py b/engine/src/flutter/sky/tools/create_full_ios_framework.py index 895a2980cf2..1c3cc0d3bca 100644 --- a/engine/src/flutter/sky/tools/create_full_ios_framework.py +++ b/engine/src/flutter/sky/tools/create_full_ios_framework.py @@ -18,8 +18,7 @@ from create_xcframework import create_xcframework # pylint: disable=import-erro ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', - 'dsymutil' + os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', '..', '..', '..')) diff --git a/engine/src/flutter/sky/tools/create_ios_framework.py b/engine/src/flutter/sky/tools/create_ios_framework.py index dc4373f5d5f..e8d77606fb4 100755 --- a/engine/src/flutter/sky/tools/create_ios_framework.py +++ b/engine/src/flutter/sky/tools/create_ios_framework.py @@ -15,8 +15,7 @@ from create_xcframework import create_xcframework # pylint: disable=import-erro ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', - 'dsymutil' + os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) diff --git a/engine/src/flutter/sky/tools/create_macos_framework.py b/engine/src/flutter/sky/tools/create_macos_framework.py index 94a215dcc7f..51020cd08f3 100755 --- a/engine/src/flutter/sky/tools/create_macos_framework.py +++ b/engine/src/flutter/sky/tools/create_macos_framework.py @@ -17,8 +17,7 @@ buildroot_dir = os.path.abspath(os.path.join(os.path.realpath(__file__), '..', ' ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', - 'dsymutil' + os.path.dirname(__file__), '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) out_dir = os.path.join(buildroot_dir, 'out') diff --git a/engine/src/flutter/testing/sanitizer_suppressions.sh b/engine/src/flutter/testing/sanitizer_suppressions.sh index ec5c4bce6ba..9b249ef629e 100755 --- a/engine/src/flutter/testing/sanitizer_suppressions.sh +++ b/engine/src/flutter/testing/sanitizer_suppressions.sh @@ -3,10 +3,10 @@ ENGINE_BUILDROOT=$(cd $TESTING_DIRECTORY/../..; pwd -P) case "$(uname -s)" in Linux) - BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/buildtools/linux-x64" + BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/flutter/buildtools/linux-x64" ;; Darwin) - BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/buildtools/mac-x64" + BUILDTOOLS_DIRECTORY="${ENGINE_BUILDROOT}/flutter/buildtools/mac-x64" ;; esac diff --git a/engine/src/flutter/testing/symbols/verify_exported.dart b/engine/src/flutter/testing/symbols/verify_exported.dart index c29a051220a..942f5cd9d1b 100644 --- a/engine/src/flutter/testing/symbols/verify_exported.dart +++ b/engine/src/flutter/testing/symbols/verify_exported.dart @@ -40,7 +40,7 @@ void main(List arguments) { outPath = p.join(engineCheckoutPath, outPath); } final String buildToolsPath = arguments.length == 1 - ? p.join(p.dirname(outPath), 'buildtools') + ? p.join(p.dirname(outPath), 'flutter', 'buildtools') : arguments[1]; String platform; diff --git a/engine/src/flutter/tools/clang_tidy/test/header_filter_regex_test.dart b/engine/src/flutter/tools/clang_tidy/test/header_filter_regex_test.dart index 4a700bac8da..21db03162d6 100644 --- a/engine/src/flutter/tools/clang_tidy/test/header_filter_regex_test.dart +++ b/engine/src/flutter/tools/clang_tidy/test/header_filter_regex_test.dart @@ -39,6 +39,7 @@ void main() { '.git', '.github', 'build_overrides', + 'buildtools', 'prebuilts', 'third_party', }; diff --git a/engine/src/flutter/tools/dia_dll.py b/engine/src/flutter/tools/dia_dll.py index 5438af756f0..ed66b42ab1d 100644 --- a/engine/src/flutter/tools/dia_dll.py +++ b/engine/src/flutter/tools/dia_dll.py @@ -18,9 +18,7 @@ import sys # Path constants. (All of these should be absolute paths.) THIS_DIR = os.path.abspath(os.path.dirname(__file__)) -LLVM_BUILD_DIR = os.path.abspath( - os.path.join(THIS_DIR, '..', '..', 'buildtools', 'windows-x64', 'clang') -) +LLVM_BUILD_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', 'buildtools', 'windows-x64', 'clang')) def GetDiaDll(): diff --git a/engine/src/flutter/tools/fuchsia/clang.gni b/engine/src/flutter/tools/fuchsia/clang.gni index cdb8e7f0729..a858227f8e8 100644 --- a/engine/src/flutter/tools/fuchsia/clang.gni +++ b/engine/src/flutter/tools/fuchsia/clang.gni @@ -2,10 +2,12 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/toolchain/toolchain.gni") + declare_args() { # The default clang toolchain provided by the prebuilt. This variable is # additionally consumed by the Go toolchain. - clang_base = rebase_path("//buildtools/${host_os}-${host_cpu}/clang/lib") + clang_base = rebase_path("$buildtools_path/${host_os}-${host_cpu}/clang/lib") } if (current_cpu == "arm64") { diff --git a/engine/src/flutter/tools/fuchsia/fuchsia_debug_symbols.gni b/engine/src/flutter/tools/fuchsia/fuchsia_debug_symbols.gni index 88254ced351..ad18d3d9d34 100644 --- a/engine/src/flutter/tools/fuchsia/fuchsia_debug_symbols.gni +++ b/engine/src/flutter/tools/fuchsia/fuchsia_debug_symbols.gni @@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/toolchain/toolchain.gni") import("//flutter/common/fuchsia_config.gni") # The inputs to this template are 'binary_path' and a boolean 'unstripped'. @@ -33,7 +34,8 @@ template("_copy_debug_symbols") { "--destination-base", rebase_path(_dest_base), "--read-elf", - rebase_path("//buildtools/${host_os}-${host_cpu}/clang/bin/llvm-readelf"), + rebase_path( + "$buildtools_path/${host_os}-${host_cpu}/clang/bin/llvm-readelf"), ] if (unstripped) { diff --git a/engine/src/flutter/tools/gn b/engine/src/flutter/tools/gn index 4aec57d6815..0be76e54773 100755 --- a/engine/src/flutter/tools/gn +++ b/engine/src/flutter/tools/gn @@ -231,7 +231,9 @@ def setup_rbe(args): if args.rbe_platform: rbe_gn_args['rbe_platform'] = args.rbe_platform - rbe_gn_args['rbe_dir'] = os.path.join(SRC_ROOT, 'buildtools', buildtools_dir(), 'reclient') + rbe_gn_args['rbe_dir'] = os.path.join( + SRC_ROOT, 'flutter', 'buildtools', buildtools_dir(), 'reclient' + ) rbe_gn_args['rbe_cfg'] = os.path.join( SRC_ROOT, 'flutter', 'build', 'rbe', 'rewrapper-' + buildtools_dir() + '.cfg' @@ -271,7 +273,7 @@ def setup_goma(args): buildtools_platform = 'mac-x64' # Prefer the goma fetched by gclient if it exists. - cipd_goma_dir = os.path.join(SRC_ROOT, 'buildtools', buildtools_platform, 'goma') + cipd_goma_dir = os.path.join(SRC_ROOT, 'flutter', 'buildtools', buildtools_platform, 'goma') # Next, if GOMA_DIR is set, use that install. goma_dir = os.environ.get('GOMA_DIR') @@ -457,6 +459,8 @@ def to_gn_args(args): gn_args = {} + gn_args['buildtools_path'] = '//flutter/buildtools' + gn_args['is_debug'] = args.unoptimized gn_args.update(setup_git_versions()) diff --git a/engine/src/flutter/tools/header_guard_check/lib/header_guard_check.dart b/engine/src/flutter/tools/header_guard_check/lib/header_guard_check.dart index d9b925715cb..8bc16c23489 100644 --- a/engine/src/flutter/tools/header_guard_check/lib/header_guard_check.dart +++ b/engine/src/flutter/tools/header_guard_check/lib/header_guard_check.dart @@ -183,6 +183,7 @@ final ArgParser _parser = ArgParser() valueHelp: 'path/to/dir/or/file (relative to the engine root)', defaultsTo: _engine != null ? [ 'build', + 'buildtools', 'impeller/compiler/code_gen_template.h', 'prebuilts', 'third_party', diff --git a/engine/src/flutter/tools/licenses/lib/paths.dart b/engine/src/flutter/tools/licenses/lib/paths.dart index 22666b8a381..63734545958 100644 --- a/engine/src/flutter/tools/licenses/lib/paths.dart +++ b/engine/src/flutter/tools/licenses/lib/paths.dart @@ -22,6 +22,7 @@ final Set skippedPaths = { r'buildtools', // only used by build r'flutter/build', r'flutter/build_overrides', // only used by build + r'flutter/buildtools', // only used by build r'flutter/ci', r'flutter/docs', r'flutter/flutter_frontend_server', diff --git a/engine/src/flutter/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart b/engine/src/flutter/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart index 41fcd319af8..d7760ff3180 100644 --- a/engine/src/flutter/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart +++ b/engine/src/flutter/tools/pkg/engine_build_configs/lib/src/build_config_runner.dart @@ -329,7 +329,7 @@ final class BuildRunner extends Runner { Platform.windows => 'windows-$_hostCpu', _ => throw StateError('This host OS "$os" is not supported.'), }; - return p.join(engineSrcDir.path, 'buildtools', platformDir); + return p.join(engineSrcDir.path, 'flutter', 'buildtools', platformDir); }(); Future _bootstrapRbe(