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

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

Issue 1465383003: [Android] Add ChromiumNetTestSupport.apk for the java EmbeddedTestServer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: yfriedman comments Created 5 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
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
}

Powered by Google App Engine
This is Rietveld 408576698