base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java - Issue 2837123003: Revert of [Android] Enable multidex for release builds of chrome_public_test_apk.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java

Issue 2837123003: Revert of [Android] Enable multidex for release builds of chrome_public_test_apk. (Closed)

Patch Set: 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 | « base/android/java/src/org/chromium/base/BaseChromiumApplication.java ('k') | base/test/android/javatests/src/org/chromium/base/test/BaseChromiumAndroidJUnitRunner.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java

diff --git a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java

index 9049cb0565e4ff4323d65da53c9d3df1dc4f93d3..3d036c2099be26d1f761f4e2ff9a7ade621a32c6 100644

--- a/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java

+++ b/base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java

@@ -12,6 +12,7 @@

import android.os.Build;

import android.support.multidex.MultiDex;

+import org.chromium.base.BuildConfig;

import org.chromium.base.Log;

import org.chromium.base.VisibleForTesting;

@@ -47,6 +48,8 @@

@VisibleForTesting

public static void install(Context context) {

+ if (!BuildConfig.isMultidexEnabled()) return;

// TODO(jbudorick): Back out this version check once support for K & below works.

// http://crbug.com/512357

if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP