From 2cae568e38dbfdbf74a69460b5845964e5d2f372 Mon Sep 17 00:00:00 2001 From: Zach Anderson Date: Mon, 26 Jul 2021 15:20:46 +0000 Subject: [PATCH] [gn] Forward the 'pool' parameter through dart actions Related: https://github.com/flutter/flutter/issues/86946 Change-Id: Ie33c93a76d6107760655a7769c6541222e169c75 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/208060 Reviewed-by: Siva Annamalai Commit-Queue: Zach Anderson --- build/dart/dart_action.gni | 8 ++++++++ utils/application_snapshot.gni | 6 ++++++ utils/compile_platform.gni | 3 +++ 3 files changed, 17 insertions(+) diff --git a/build/dart/dart_action.gni b/build/dart/dart_action.gni index c357aad4d99..334a09a8f20 100644 --- a/build/dart/dart_action.gni +++ b/build/dart/dart_action.gni @@ -51,6 +51,10 @@ template("_compiled_action") { testonly = invoker.testonly } + if (defined(invoker.pool)) { + pool = invoker.pool + } + script = "$_dart_root/build/gn_run_binary.py" if (defined(invoker.inputs)) { @@ -109,6 +113,7 @@ template("_prebuilt_tool_action") { "depfile", "deps", "outputs", + "pool", "testonly", "visibility", ]) @@ -256,6 +261,7 @@ template("_built_tool_action") { "deps", "inputs", "outputs", + "pool", "tool", "testonly", "visibility", @@ -321,6 +327,7 @@ template("dart_action") { "inputs", "outputs", "packages", + "pool", "script", "testonly", "tool", @@ -380,6 +387,7 @@ template("gen_snapshot_action") { "inputs", "outputs", "packages", + "pool", "testonly", "tool", "visibility", diff --git a/utils/application_snapshot.gni b/utils/application_snapshot.gni index 317153a67cb..6a2efbb80ec 100644 --- a/utils/application_snapshot.gni +++ b/utils/application_snapshot.gni @@ -82,6 +82,9 @@ 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") { + if (defined(invoker.pool)) { + pool = invoker.pool + } deps = extra_deps + [ "$_dart_root/runtime/vm:kernel_platform_files($host_toolchain)", "$_dart_root/runtime/vm:vm_platform", @@ -131,6 +134,9 @@ template("_application_snapshot") { # Create a snapshot from kernel built above. dart_action(target_name) { + if (defined(invoker.pool)) { + pool = invoker.pool + } deps = extra_deps + [ ":${target_name}_dill" ] depfile = "$output.d" diff --git a/utils/compile_platform.gni b/utils/compile_platform.gni index 447ed644a04..37c340726b1 100644 --- a/utils/compile_platform.gni +++ b/utils/compile_platform.gni @@ -41,6 +41,9 @@ template("compile_platform") { } prebuilt_dart_action(target_name) { + if (defined(invoker.pool)) { + pool = invoker.pool + } script = "$_dart_root/pkg/front_end/tool/_fasta/compile_platform.dart" packages = "$_dart_root/.packages"