summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRex Hoffman <rexhoffman@google.com>2022-12-08 17:06:06 +0000
committerPresubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com>2022-12-08 17:06:06 +0000
commitf26ea610f89c738ea04ef30596db04f63195dcac (patch)
tree69a48ad062682e9946cd1a2a997e0a5b48f37fba
parent4200e70817713a1d9d8ce8d8521673b123acb947 (diff)
parentc4d200e9db72ef1213d9d82f4d91a368ee82ec54 (diff)
downloadmobile-data-download-f26ea610f89c738ea04ef30596db04f63195dcac.tar.gz
[automerge] Use new robolectric 2p: c4d200e9db
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/20671105 Bug: 261728063 Change-Id: Ib4d964eaded8e416bcc094a1db9fc8bf3a4d22e5
-rw-r--r--javatests/Android.bp9
1 files changed, 7 insertions, 2 deletions
diff --git a/javatests/Android.bp b/javatests/Android.bp
index 9fc1ed5..12c9fbb 100644
--- a/javatests/Android.bp
+++ b/javatests/Android.bp
@@ -47,12 +47,17 @@ android_robolectric_test {
java_resource_dirs: ["config"],
libs: [
- "Robolectric_all-target",
+ // This jar should not be included, android_robolectric_test soong tasks either ads
+ // "Robolectric_all-target" or "Robolectric_all-target_upstream" based on the "upstream"
+ // flag below.
"androidx.test.core",
"mobile_data_downloader_lib",
"mdd-robolectric-library",
],
+ // use external/robolectric, rather than the outdated external/robolectric-shadows.
+ upstream: true,
+
instrumentation_for: "MobileDataDownloadPlaceHolderApp",
-} \ No newline at end of file
+}