| Index: base/BUILD.gn
|
| diff --git a/base/BUILD.gn b/base/BUILD.gn
|
| index a41efac995d991d9a715e939e1ca40f372af8b7a..3075098b95c86b0496830726d7041b6332dcd610 100644
|
| --- a/base/BUILD.gn
|
| +++ b/base/BUILD.gn
|
| @@ -2390,6 +2390,20 @@
|
| ]
|
| }
|
|
|
| + # TODO(jbudorick): Remove this once we roll to robolectric 3.0 and pull
|
| + # in the multidex shadow library. crbug.com/522043
|
| + # GYP: //base.gyp:base_junit_test_support
|
| + java_library("base_junit_test_support") {
|
| + testonly = true
|
| + java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/ShadowMultiDex.java" ]
|
| + deps = [
|
| + "//third_party/android_tools:android_support_multidex_java",
|
| + "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
|
| + "//third_party/robolectric:robolectric_java",
|
| + ]
|
| + srcjar_deps = [ ":base_build_config_gen" ]
|
| + }
|
| +
|
| # GYP: //base.gyp:base_junit_tests
|
| junit_binary("base_junit_tests") {
|
| java_files = [
|
| @@ -2404,8 +2418,8 @@
|
| deps = [
|
| ":base_java",
|
| ":base_java_test_support",
|
| - ]
|
| - srcjar_deps = [ ":base_build_config_gen" ]
|
| + ":base_junit_test_support",
|
| + ]
|
| }
|
|
|
| # GYP: //base.gyp:base_java_application_state
|
|
|