base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java - Issue 1597273005: Move ChromiumMultiDex to BuildConfig.

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 1597273005: Move ChromiumMultiDex to BuildConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Prevent jni exception in release. 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

« base/android/java/src/org/chromium/base/metrics/RecordHistogram.java ('K') | « base/android/java/src/org/chromium/base/metrics/RecordHistogram.java ('k') | base/android/java/templates/ChromiumBuildConfig.template » ('j') | build/config/android/rules.gni » ('J')
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 e4b30b94685fcd8c421df57be95c1217bf8ead86..a5d4493a63946a3f0d2fff88cd8d4b59f908459d 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.content.pm.PackageManager;

import android.os.Build;

import android.support.multidex.MultiDex;

+import org.chromium.base.ChromiumBuildConfig;

import org.chromium.base.Log;

import org.chromium.base.VisibleForTesting;

@@ -47,7 +48,7 @@ public class ChromiumMultiDexInstaller {

@VisibleForTesting

public static void install(Context context) {

- if (!ChromiumMultiDex.isMultidexEnabled()) return;

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

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

// http://crbug.com/512357