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

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

Issue 2839983002: [Android] Enable multidex for release builds of chrome_public_test_apk. (RELAND) (Closed)
Patch Set: roll deps 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
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 d44c9ddce6dd080d252e30d85864d07db8985afa..693bb6261eda3792a3a31c83798609e7c388492d 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,7 +4,8 @@
package org.chromium.base.test;
-import android.os.Bundle;
+import android.app.Application;
+import android.content.Context;
import org.chromium.base.multidex.ChromiumMultiDexInstaller;
import org.chromium.base.test.util.CommandLineFlags;
@@ -16,9 +17,12 @@ import org.chromium.base.test.util.CommandLineFlags;
*/
public class BaseChromiumInstrumentationTestRunner extends BaseInstrumentationTestRunner {
@Override
- public void onCreate(Bundle arguments) {
- ChromiumMultiDexInstaller.install(getTargetContext());
- super.onCreate(arguments);
+ 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);
}
/**

Powered by Google App Engine
This is Rietveld 408576698