base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java - Issue 2834603006: ABANDONED [android] Create per-package configuration for multidex.

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 2834603006: ABANDONED [android] Create per-package configuration for multidex. (Closed)

Patch Set: tweaks 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

« base/android/java/src/org/chromium/base/PackageBuildConfig.java ('K') | « base/android/java/src/org/chromium/base/PackageBuildConfig.java ('k') | base/android/java/templates/BuildConfig.template » ('j') | build/android/main_dex_classes.flags » ('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 3d036c2099be26d1f761f4e2ff9a7ade621a32c6..f0b1aeba6ee4828f488cae89e13e2236213328ed 100644

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

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

@@ -12,8 +12,8 @@ import android.content.pm.PackageManager;

import android.os.Build;

import android.support.multidex.MultiDex;

-import org.chromium.base.BuildConfig;

import org.chromium.base.Log;

+import org.chromium.base.PackageBuildConfig;

import org.chromium.base.VisibleForTesting;

import java.lang.reflect.InvocationTargetException;

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

@VisibleForTesting

public static void install(Context context) {

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

+ if (!PackageBuildConfig.isMultidexEnabled(context)) return;

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

// http://crbug.com/512357

@@ -74,7 +74,6 @@ public class ChromiumMultiDexInstaller {

break;

}

return currentProcessName;

} catch (SecurityException ex) {

return null;

@@ -83,7 +82,7 @@ public class ChromiumMultiDexInstaller {

// Determines whether MultiDex should be installed for the current process. Isolated

// Processes should skip MultiDex as they can not actually access the files on disk.

- // Privileged processes need ot have all of their dependencies in the MainDex for

+ // Privileged processes need to have all of their dependencies in the MainDex for

// performance reasons.

private static boolean shouldInstallMultiDex(Context context) {

try {