diff options
| author | jbudorick <jbudorick@chromium.org> | 2016-01-15 11:43:47 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 19:44:53 +0000 |
| commit | ab450c5ede0635194331286088d0f488f4086ba5 (patch) | |
| tree | 7435c3011a8270552696deb6125422a6fa0d1066 /testing | |
| parent | 8d3d8dd4bbf5d0876f3c787b447e97dba971795a (diff) | |
| download | chromium_src-ab450c5ede0635194331286088d0f488f4086ba5.zip chromium_src-ab450c5ede0635194331286088d0f488f4086ba5.tar.gz chromium_src-ab450c5ede0635194331286088d0f488f4086ba5.tar.bz2 | |
[Android] Rework multidex and enable multidex for unit_tests_apk. (RELAND)
This is a reland of https://codereview.chromium.org/1581563003
BUG=272790
TBR=thakis@chromium.org,yfriedman@chromium.org,phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1590243003
Cr-Commit-Position: refs/heads/master@{#369815}
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java | 3 | ||||
| -rw-r--r-- | testing/test.gni | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java index bdba1e0..00d5c78 100644 --- a/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java +++ b/testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java @@ -15,6 +15,7 @@ import android.os.Process; import org.chromium.base.CommandLine; import org.chromium.base.Log; import org.chromium.base.annotations.JNINamespace; +import org.chromium.base.multidex.ChromiumMultiDexInstaller; import org.chromium.test.reporter.TestStatusReporter; import java.io.File; @@ -50,7 +51,9 @@ public class NativeTestActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { + ChromiumMultiDexInstaller.install(this); super.onCreate(savedInstanceState); + CommandLine.init(new String[]{}); parseArgumentsFromIntent(getIntent()); diff --git a/testing/test.gni b/testing/test.gni index 7ce5d85..6739bfe 100644 --- a/testing/test.gni +++ b/testing/test.gni @@ -66,6 +66,7 @@ template("test") { [ "android_manifest", "deps", + "enable_multidex", "use_default_launcher", "write_asset_list", ]) |