base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java - Issue 1587673014: Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND)

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/BaseInstrumentationTestRunner.java

Issue 1587673014: Revert of [Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

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

index 669307c82b43c749422ba85bb07ce50f0aa4f4f4..8bf3d0fb454b9463ec303e091dc8ebceff432365 100644

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

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

@@ -18,7 +18,7 @@

import org.chromium.base.Log;

import org.chromium.base.SysUtils;

-import org.chromium.base.multidex.ChromiumMultiDexInstaller;

+import org.chromium.base.multidex.ChromiumMultiDex;

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

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

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

@@ -37,7 +37,7 @@

@Override

public void onCreate(Bundle arguments) {

- ChromiumMultiDexInstaller.install(getTargetContext());

+ ChromiumMultiDex.install(getTargetContext());

super.onCreate(arguments);

}

« no previous file with comments | « base/base.gyp ('k') | build/android/gyp/configure_multidex.py » ('j') | no next file with comments »