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

Unified Diff: chrome/android/BUILD.gn

Issue 2905353003: Enable multidex for ChromePublicTests app (Closed)
Patch Set: Always turn on multidex to avoid MultiDexApplication not being included in apk when in debug mode Created 3 years, 7 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 | « no previous file | chrome/android/javatests/AndroidManifest.xml » ('j') | 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 2f118f0ea97a0a0e74f4e94eb1ed299c679ffbdd..91efb3a829137880349c881cc5973277edcc50f8 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -915,8 +915,11 @@ instrumentation_test_apk("chrome_public_test_apk") {
# 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
+ # the dex limit. Using android.support.multidex.MultiDexApplication
jbudorick 2017/06/06 05:44:59 This is not the right place for this comment. It'd
aluo 2017/06/07 00:52:17 Done.
+ # to support this case which requires multidex support. Can't use
+ # BaseChromiumApplication due to BuildConfig.java conflict with
+ # chrome_public_apk.
+ enable_multidex = true
jbudorick 2017/06/06 05:44:59 I don't think this is the right way to ensure Mult
aluo 2017/06/07 00:52:17 That wasn't enough, still couldn't find class in d
}
if (enable_vr) {
« no previous file with comments | « no previous file | chrome/android/javatests/AndroidManifest.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698