From 351acd155d5ccfe22e3b69ce7fc2bcd83308bc5e Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Thu, 12 Sep 2019 20:42:42 +0000 Subject: [PATCH] [build] Fix application_snapshot.gni for uses outside of utils/xyz. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cf. 74cff6c7df3e8f212c7f41a3a25631e007abc0f7 Change-Id: I7af53019bbe4bfe3eba8fc3a4648ec70a26cbc90 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/117013 Reviewed-by: Alexander Markov Reviewed-by: Alexander Aprelev Reviewed-by: Régis Crelier Commit-Queue: Ryan Macnak --- utils/application_snapshot.gni | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/utils/application_snapshot.gni b/utils/application_snapshot.gni index bb10c1d0857..8504b2db382 100644 --- a/utils/application_snapshot.gni +++ b/utils/application_snapshot.gni @@ -78,11 +78,12 @@ template("_application_snapshot") { # Build the kernel file using the prebuilt VM to speed up the debug and # simulator builds. prebuilt_dart_action(target_name + "_dill") { - deps = extra_deps + [ - "../../runtime/vm:kernel_platform_files($dart_host_toolchain)", - "../../runtime/vm:vm_platform", - ] - gen_kernel_script = "../../pkg/vm/bin/gen_kernel.dart" + deps = + extra_deps + [ + "$_dart_root/runtime/vm:kernel_platform_files($dart_host_toolchain)", + "$_dart_root/runtime/vm:vm_platform", + ] + gen_kernel_script = "$_dart_root/pkg/vm/bin/gen_kernel.dart" platform_dill = "$root_out_dir/vm_platform_strong.dill" inputs = extra_inputs + [ @@ -91,7 +92,7 @@ template("_application_snapshot") { main_dart, dot_packages, ] - output = "$root_gen_dir/$name.dart.dill" + output = "$target_gen_dir/$name.dart.dill" outputs = [ output, ] @@ -131,7 +132,7 @@ template("_application_snapshot") { deps = extra_deps + [ ":${target_name}_dill" ] depfile = "$output.d" - script = "$root_gen_dir/$name.dart.dill" + script = "$target_gen_dir/$name.dart.dill" inputs = extra_inputs