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

Index: base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java

diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java

index 693bb6261eda3792a3a31c83798609e7c388492d..d44c9ddce6dd080d252e30d85864d07db8985afa 100644

--- a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java

+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java

@@ -4,8 +4,7 @@

package org.chromium.base.test;

-import android.app.Application;

-import android.content.Context;

+import android.os.Bundle;

import org.chromium.base.multidex.ChromiumMultiDexInstaller;

import org.chromium.base.test.util.CommandLineFlags;

@@ -17,12 +16,9 @@

public class BaseChromiumInstrumentationTestRunner extends BaseInstrumentationTestRunner {

@Override

- public Application newApplication(ClassLoader cl, String className, Context context)

- throws ClassNotFoundException, IllegalAccessException, InstantiationException {

- ChromiumMultiDexInstaller.install(new BaseChromiumRunnerCommon.MultiDexContextWrapper(

- getContext(), getTargetContext()));

- BaseChromiumRunnerCommon.reorderDexPathElements(cl, getContext(), getTargetContext());

- return super.newApplication(cl, className, context);

+ public void onCreate(Bundle arguments) {

+ ChromiumMultiDexInstaller.install(getTargetContext());

+ super.onCreate(arguments);

}

/**