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

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

Issue 1581563003: [Android] Rework multidex and enable multidex for unit_tests_apk. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index d54779689bbd5c9b1b7b03292c4938a4d1b81f77..5be33d3a4a7dc70336efb1675916c447b6c1a72a 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1483,6 +1483,19 @@ template("android_apk") {
_srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
}
+ java_cpp_template("${_template_name}__multidex_config_java") {
+ package_name = "org/chromium/base/multidex"
+ sources = [
+ "//base/android/java/templates/ChromiumMultiDex.template",
+ ]
+
+ defines = []
+ if (enable_multidex) {
+ defines += [ "ENABLE_MULTIDEX" ]
+ }
+ }
+ _srcjar_deps += [ ":${_template_name}__multidex_config_java" ]
agrieve 2016/01/12 03:48:28 I think this adds ChromiumMultidex.java to *every*
jbudorick 2016/01/12 04:48:11 Didn't do anything here yet pending further discus
agrieve 2016/01/12 20:25:46 Ironically, the best docs I could find are from bu
+
java_target = "${_template_name}__java"
java_library_impl(java_target) {
forward_variables_from(invoker, [ "run_findbugs" ])

Powered by Google App Engine
This is Rietveld 408576698