From bf6edc78c029a3cf0f0ba73d55572cec8d4e79bd Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Mon, 15 Sep 2025 17:10:42 -0700 Subject: [PATCH] [build] Fix Windows ARM64. There is no kernel service snapshot in the Windows ARM64 SDK. Change-Id: I735524efb95b4951a9d668d096ba97e41c469426 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/449603 Reviewed-by: Alexander Aprelev Commit-Queue: Ryan Macnak --- build/dart/dart_action.gni | 3 +-- build/rbe/rewrapper_dart.py | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/dart/dart_action.gni b/build/dart/dart_action.gni index a4b12c71213..70536b61ca3 100644 --- a/build/dart/dart_action.gni +++ b/build/dart/dart_action.gni @@ -132,7 +132,7 @@ template("_prebuilt_tool_action") { ]) script = "$_dart_root/build/gn_run_binary.py" - inputs = [] + inputs = [ invoker.binary ] if (defined(invoker.inputs)) { inputs += invoker.inputs } @@ -210,7 +210,6 @@ template("prebuilt_dart_action") { _prebuilt_tool_action(target_name) { forward_variables_from(invoker, "*") binary = "$_dart_root/tools/sdks/dart-sdk/bin/dart$executable_suffix" - dfe = "$_dart_root/tools/sdks/dart-sdk/bin/snapshots/kernel-service.dart.snapshot" } } diff --git a/build/rbe/rewrapper_dart.py b/build/rbe/rewrapper_dart.py index e81969ddefd..0efcc438ccc 100644 --- a/build/rbe/rewrapper_dart.py +++ b/build/rbe/rewrapper_dart.py @@ -282,6 +282,13 @@ trace to find the place to insert the appropriate support. self.unsupported('rewrapper', arg) def parse_dart(self): + self.extra_paths.add( + self.rebase(os.path.join(self.dart_subdir, 'dartvm'))) + self.extra_paths.add( + self.rebase( + os.path.join(self.dart_subdir, + 'snapshots/kernel-service.dart.snapshot'))) + while self.has_next_arg: arg = self.next_arg() if self.get_option(['--dfe']):