Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(924)

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

Issue 1278573002: [Android] Add gyp support for multidex. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 cd202ccd61ff0b445543e5b66d95b86e7c7d1799..c18a3cbd709046fabe138c9fc51f8ec450b96310 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
@@ -20,6 +20,7 @@ import junit.framework.TestResult;
import org.chromium.base.CommandLine;
import org.chromium.base.Log;
import org.chromium.base.SysUtils;
+import org.chromium.base.multidex.ChromiumMultiDex;
import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.MinAndroidSdkLevel;
import org.chromium.base.test.util.Restriction;
@@ -39,6 +40,12 @@ public class BaseInstrumentationTestRunner extends InstrumentationTestRunner {
private static final int SLEEP_INTERVAL = 50; // milliseconds
private static final int WAIT_DURATION = 5000; // milliseconds
+ @Override
+ public void onCreate(Bundle arguments) {
+ ChromiumMultiDex.install(getTargetContext());
+ super.onCreate(arguments);
+ }
+
/**
* An interface for classes that check whether a test case should be skipped.
*/

Powered by Google App Engine
This is Rietveld 408576698