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

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

Issue 1013463003: Update from https://crrev.com/320931 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 9 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/config/android/config.gni ('k') | build/config/compiler/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 28608cbdd75a455749b6cdc776e98fe7cf91a78e..a0569974e1b71268a759aad9d57b35846ede3cfb 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1216,6 +1216,11 @@ template("android_apk") {
invoker.enable_relocation_packing) {
_enable_relocation_packing = true
}
+
+ _native_lib_version_name = ""
+ if (defined(invoker.native_lib_version_name)) {
+ _native_lib_version_name = invoker.native_lib_version_name
+ }
}
_rebased_build_config = rebase_path(_build_config, root_build_dir)
@@ -1252,8 +1257,6 @@ template("android_apk") {
_enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
}
- _native_lib_version_name = ""
-
java_cpp_template("${_template_name}__native_libraries_java") {
package_name = "org/chromium/base/library_loader"
sources = [
« no previous file with comments | « build/config/android/config.gni ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698