diff options
| author | jbudorick <jbudorick@chromium.org> | 2016-01-15 17:21:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-16 01:23:53 +0000 |
| commit | 070dd8c416495cb051617b05681353e096c463b7 (patch) | |
| tree | ba18422b1d9700af664abf1459ae2d450c92a9ce /base/test | |
| parent | 5f578079ddfe10de97b27d179d0c2b1718d119c3 (diff) | |
| download | chromium_src-070dd8c416495cb051617b05681353e096c463b7.zip chromium_src-070dd8c416495cb051617b05681353e096c463b7.tar.gz chromium_src-070dd8c416495cb051617b05681353e096c463b7.tar.bz2 | |
[Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND 2)
this is a reland of https://codereview.chromium.org/1590243003/
BUG=272790
TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1594653002
Cr-Commit-Position: refs/heads/master@{#369906}
Diffstat (limited to 'base/test')
| -rw-r--r-- | base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 8bf3d0fb..669307c 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 junit.framework.TestResult; import org.chromium.base.Log; import org.chromium.base.SysUtils; -import org.chromium.base.multidex.ChromiumMultiDex; +import org.chromium.base.multidex.ChromiumMultiDexInstaller; 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 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner { @Override public void onCreate(Bundle arguments) { - ChromiumMultiDex.install(getTargetContext()); + ChromiumMultiDexInstaller.install(getTargetContext()); super.onCreate(arguments); } |