Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6194)

Unified Diff: build/compiled_action.gni

Issue 2494853002: Make gn_run_binary.py do the right thing for compiled_action (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/gn_run_binary.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/compiled_action.gni
diff --git a/build/compiled_action.gni b/build/compiled_action.gni
index b6d0c4d773df0c8a0c7fd041a4e0fc5608dcd737..e4e999ac576450eea1298443719c821e13369c63 100644
--- a/build/compiled_action.gni
+++ b/build/compiled_action.gni
@@ -72,6 +72,8 @@ if (host_os == "win") {
_host_executable_suffix = ""
}
+_dart_root = rebase_path("..")
+
template("compiled_action") {
assert(defined(invoker.tool), "tool must be defined for $target_name")
assert(defined(invoker.outputs), "outputs must be defined for $target_name")
@@ -85,7 +87,7 @@ template("compiled_action") {
visibility = invoker.visibility
}
- script = "//build/gn_run_binary.py"
+ script = "$_dart_root/build/gn_run_binary.py"
if (defined(invoker.inputs)) {
inputs = invoker.inputs
@@ -118,7 +120,10 @@ template("compiled_action") {
# The script takes as arguments the binary to run, and then the arguments
# to pass it.
- args = [ rebase_path(host_executable, root_build_dir) ] + invoker.args
+ args = [
+ "compiled_action",
+ rebase_path(host_executable, root_build_dir)
+ ] + invoker.args
}
}
@@ -134,7 +139,7 @@ template("compiled_action_foreach") {
visibility = invoker.visibility
}
- script = "//build/gn_run_binary.py"
+ script = "$_dart_root/build/gn_run_binary.py"
sources = invoker.sources
if (defined(invoker.inputs)) {
@@ -168,6 +173,9 @@ template("compiled_action_foreach") {
# The script takes as arguments the binary to run, and then the arguments
# to pass it.
- args = [ rebase_path(host_executable, root_build_dir) ] + invoker.args
+ args = [
+ "compiled_action",
+ rebase_path(host_executable, root_build_dir)
+ ] + invoker.args
}
}
« no previous file with comments | « no previous file | build/gn_run_binary.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698