diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-08-25 14:36:59 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-25 21:38:00 +0000 |
| commit | f091dcb5146ce071e183303bd316f06e92b6ee3e (patch) | |
| tree | 352bd2a373ac3423cd3604c7ed3d9ef799cc6a9f /chrome/android/junit | |
| parent | d088d16429595fd6702e5e8542089f1b4fc34b7d (diff) | |
| download | chromium_src-f091dcb5146ce071e183303bd316f06e92b6ee3e.zip chromium_src-f091dcb5146ce071e183303bd316f06e92b6ee3e.tar.gz chromium_src-f091dcb5146ce071e183303bd316f06e92b6ee3e.tar.bz2 | |
[Android] Add gyp support for multidex. (RELAND)
Reland of https://codereview.chromium.org/1278573002
BUG=272790
TBR=thakis@chromium.org,mmenke@chromium.org
Review URL: https://codereview.chromium.org/1318513003
Cr-Commit-Position: refs/heads/master@{#345443}
Diffstat (limited to 'chrome/android/junit')
| -rw-r--r-- | chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java index 54522d8..d8809d2 100644 --- a/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java +++ b/chrome/android/junit/src/org/chromium/chrome/browser/media/remote/AbstractMediaRouteControllerTest.java @@ -32,6 +32,7 @@ import android.support.v7.media.MediaRouter.RouteInfo; import org.chromium.base.ApplicationStatus; import org.chromium.base.BaseChromiumApplication; import org.chromium.base.CommandLine; +import org.chromium.base.test.shadows.ShadowMultiDex; import org.chromium.base.test.util.Feature; import org.chromium.chrome.browser.media.remote.MediaRouteController.MediaStateListener; import org.chromium.chrome.browser.media.remote.MediaRouteController.UiListener; @@ -51,8 +52,8 @@ import org.robolectric.internal.ReflectionHelpers; /** Tests for {@link AbstractMediaRouteController}. */ @RunWith(LocalRobolectricTestRunner.class) -@Config(manifest = Config.NONE, shadows = AbstractMediaRouteControllerTest.ShadowMediaRouter.class, - application = BaseChromiumApplication.class) +@Config(manifest = Config.NONE, application = BaseChromiumApplication.class, + shadows = {AbstractMediaRouteControllerTest.ShadowMediaRouter.class, ShadowMultiDex.class}) public class AbstractMediaRouteControllerTest { /** Reset the environment before each test. */ |