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

Unified Diff: build/config/android/internal_rules.gni

Issue 377803003: Change FileArg syntax (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-resources
Patch Set: Rebase Created 6 years, 5 months 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 | « build/android/gyp/write_build_config.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index a4bd0b91ad6a4f16b2f0b773d7973f1a256e6132..2034ca836c0c43d3b9b049512cff27e0b516aada 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -17,7 +17,7 @@ rebased_android_sdk_build_tools = rebase_path(android_sdk_build_tools, root_buil
# require knowledge about this target's dependencies and cannot be calculated
# at gn-time). There is a special syntax to add a value in that dictionary to
# an action/action_foreachs args:
-# --python-arg=@($rebased_build_config_path:key0:key1)
+# --python-arg=@FileArg($rebased_build_config_path:key0:key1)
# At runtime, such an arg will be replaced by the value in the build_config.
# See build/android/gyp/write_build_config.py and
# build/android/gyp/util/build_utils.py:ExpandFileArgs
@@ -182,10 +182,10 @@ template("java_library") {
args = [
"--depfile=$rebase_depfile",
"--classpath=$rebase_system_jars",
- "--classpath=@($rebase_build_config:javac:classpath)",
+ "--classpath=@FileArg($rebase_build_config:javac:classpath)",
"--jar-path=$rebase_jar_path",
"--java-srcjars=$rebase_java_srcjars",
- "--java-srcjars=@($rebase_build_config:javac:srcjars)",
+ "--java-srcjars=@FileArg($rebase_build_config:javac:srcjars)",
"--jar-excluded-classes=$jar_excluded_patterns",
]
if (chromium_code) {
@@ -300,7 +300,7 @@ template("process_resources") {
"--srcjar-out", rebase_path(srcjar_path, root_build_dir),
"--resource-zip-out", rebase_path(zip_path, root_build_dir),
- "--dependencies-res-zips=@($rebase_build_config:resources:dependency_zips)",
+ "--dependencies-res-zips=@FileArg($rebase_build_config:resources:dependency_zips)",
]
if (defined(invoker.custom_package)) {
« no previous file with comments | « build/android/gyp/write_build_config.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698