Skip to content

Commit bf6edc7

Browse files
rmacnak-googleCommit Queue
authored andcommitted
[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 <[email protected]> Commit-Queue: Ryan Macnak <[email protected]>
1 parent 03d0629 commit bf6edc7

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

build/dart/dart_action.gni

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ template("_prebuilt_tool_action") {
132132
])
133133
script = "$_dart_root/build/gn_run_binary.py"
134134

135-
inputs = []
135+
inputs = [ invoker.binary ]
136136
if (defined(invoker.inputs)) {
137137
inputs += invoker.inputs
138138
}
@@ -210,7 +210,6 @@ template("prebuilt_dart_action") {
210210
_prebuilt_tool_action(target_name) {
211211
forward_variables_from(invoker, "*")
212212
binary = "$_dart_root/tools/sdks/dart-sdk/bin/dart$executable_suffix"
213-
dfe = "$_dart_root/tools/sdks/dart-sdk/bin/snapshots/kernel-service.dart.snapshot"
214213
}
215214
}
216215

build/rbe/rewrapper_dart.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,13 @@ def parse_rewrapper(self):
282282
self.unsupported('rewrapper', arg)
283283

284284
def parse_dart(self):
285+
self.extra_paths.add(
286+
self.rebase(os.path.join(self.dart_subdir, 'dartvm')))
287+
self.extra_paths.add(
288+
self.rebase(
289+
os.path.join(self.dart_subdir,
290+
'snapshots/kernel-service.dart.snapshot')))
291+
285292
while self.has_next_arg:
286293
arg = self.next_arg()
287294
if self.get_option(['--dfe']):

0 commit comments

Comments
 (0)