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

Unified Diff: chrome/android/BUILD.gn

Issue 2836723002: [Android] Enable multidex for release builds of chrome_public_test_apk. (Closed)
Patch Set: agrieve comments Created 3 years, 8 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/rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index c2b244d3f7081ebd8c6a97f955fa940bb71fc89a..1dcb3c61770635296d5d786060c6dc9db4bcf1d3 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -882,6 +882,11 @@ instrumentation_test_apk("chrome_public_test_apk") {
"//net/android:net_test_support_apk",
]
proguard_enabled = !is_java_debug
+
+ # The test APK contains code from both the APK under test and the
+ # test APK when proguard is enabled. That causes this APK to exceed
+ # the dex limit.
+ enable_multidex = proguard_enabled
}
if (enable_vr) {
« no previous file with comments | « build/config/android/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698