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

Unified Diff: base/android/java/templates/ChromiumMultiDex.template

Issue 1408163009: [Android] Enable multidex for debug builds of ChromePublic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: actually remove --tested-apk-multidex-configuration-path 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: base/android/java/templates/ChromiumMultiDex.template
diff --git a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java b/base/android/java/templates/ChromiumMultiDex.template
similarity index 95%
rename from base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java
rename to base/android/java/templates/ChromiumMultiDex.template
index 7696a14568e1cb079597b2fb526a9063dfabbb31..18b3c77dfb9dd86423c80410ab76df43e5a4015e 100644
--- a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDex.java
+++ b/base/android/java/templates/ChromiumMultiDex.template
@@ -30,6 +30,7 @@ public class ChromiumMultiDex {
* @param context The application context.
*/
@VisibleForTesting
+#if defined(CONFIGURATION_NAME_Debug)
Yaron 2015/11/12 22:15:20 nit: why not just put this in the method body and
jbudorick 2015/11/12 22:20:49 I wanted to also encapsulate processIsIsolated() b
Yaron 2015/11/12 22:27:45 Acknowledged.
public static void install(Context context) {
try {
// TODO(jbudorick): Back out this version check once support for K & below works.
@@ -54,5 +55,9 @@ public class ChromiumMultiDex {
throws NoSuchMethodException, IllegalAccessException, InvocationTargetException {
return (boolean) Process.class.getMethod("isIsolated").invoke(null);
}
+#else
+ public static void install(Context context) {
+ }
+#endif
}

Powered by Google App Engine
This is Rietveld 408576698