Index: build/config/android/rules.gni |
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni |
index f3f5e27e4161886cfeb33b300d32af048d057aaa..3b01608d2c8debae2d1f3dfbb39bbf1b31ec78bf 100644 |
--- a/build/config/android/rules.gni |
+++ b/build/config/android/rules.gni |
@@ -1349,6 +1349,17 @@ template("android_apk") { |
if (defined(invoker.native_lib_version_arg)) { |
_native_lib_version_arg = invoker.native_lib_version_arg |
} |
+ |
+ _native_libraries_template = |
+ "//base/android/java/templates/NativeLibraries.template" |
+ if (defined(invoker.native_libraries_template)) { |
+ _native_libraries_template = invoker.native_libraries_template |
+ } |
+ |
+ _native_libraries_package_name = "org/chromium/base/library_loader" |
+ if (defined(invoker.native_libraries_package_name)) { |
+ _native_libraries_package_name = invoker.native_libraries_package_name |
+ } |
} |
_android_manifest_deps = [] |
@@ -1434,9 +1445,9 @@ template("android_apk") { |
} |
java_cpp_template("${_template_name}__native_libraries_java") { |
- package_name = "org/chromium/base/library_loader" |
+ package_name = _native_libraries_package_name |
sources = [ |
- "//base/android/java/templates/NativeLibraries.template", |
+ _native_libraries_template, |
] |
inputs = [ |
_build_config, |
@@ -1878,6 +1889,7 @@ template("instrumentation_test_apk") { |
"//tools/android/forwarder2", |
"//tools/android/md5sum", |
] |
+ |
run_findbugs = false |
} |