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

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

Issue 1229073003: Move Android version stamping from an exec_script -> build rule (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn14
Patch Set: fix default argument for native lib version Created 5 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 | « no previous file | build/util/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 1a21f9207d2bbed90ed86e9ca62628938378f140..709aaae300c34e259769e93803207f8a914e215b 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1453,9 +1453,13 @@ template("android_apk") {
_enable_relocation_packing = true
}
- _native_lib_version_name = ""
- if (defined(invoker.native_lib_version_name)) {
- _native_lib_version_name = invoker.native_lib_version_name
+ _native_lib_version_rule = ""
+ if (defined(invoker.native_lib_version_rule)) {
+ _native_lib_version_rule = invoker.native_lib_version_rule
+ }
+ _native_lib_version_arg = "\"\""
+ if (defined(invoker.native_lib_version_arg)) {
+ _native_lib_version_arg = invoker.native_lib_version_arg
}
}
@@ -1536,11 +1540,14 @@ template("android_apk") {
deps = [
":$build_config_target",
]
+ if (_native_lib_version_rule != "") {
+ deps += [ _native_lib_version_rule ]
+ }
defines = [
"NATIVE_LIBRARIES_LIST=" +
"@FileArg($_rebased_build_config:native:java_libraries_list)",
- "NATIVE_LIBRARIES_VERSION_NUMBER=\"$_native_lib_version_name\"",
+ "NATIVE_LIBRARIES_VERSION_NUMBER=$_native_lib_version_arg",
]
if (_use_chromium_linker) {
defines += [ "ENABLE_CHROMIUM_LINKER" ]
« no previous file with comments | « no previous file | build/util/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698