commit 19bde5b0daeb0b289a6bf50f15da047f2f50a857
author Rex Hoffman <rexhoffman@google.com> Sat Mar 18 06:48:17 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 18 06:48:17 2023 +0000
tree 9a96583f1cfe1c7a562faca8fe7610ac7c327c41
parent 596e9d8e5a622e94a71223ddfce16ebcf880e948
parent e6f0b196ed7e9efb32b9cf96eeb562f4f866155a

Merge "Update to /external/robolectric rather than older /external/robolectric-shadows"

nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp

diff --git a/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp b/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp
index 284d5c2..ec0392c 100644
--- a/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp
+++ b/nearby/tests/multidevices/clients/test_support/snippet_helper/tests/Android.bp
@@ -35,4 +35,5 @@
         // timeout in seconds.
         timeout: 36000,
     },
-}
\ No newline at end of file
+    upstream: true,
+}

nearby/tests/robotests/Android.bp

diff --git a/nearby/tests/robotests/Android.bp b/nearby/tests/robotests/Android.bp
index 56c0107..70fa0c3 100644
--- a/nearby/tests/robotests/Android.bp
+++ b/nearby/tests/robotests/Android.bp
@@ -42,15 +42,14 @@
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.mediarouter_mediarouter-nodeps",
         "error_prone_annotations",
-        "mockito-robolectric-prebuilt",
         "service-nearby-pre-jarjar",
         "truth-prebuilt",
         "robolectric_android-all-stub",
-        "Robolectric_all-target",
     ],
 
     test_options: {
         // timeout in seconds.
         timeout: 36000,
     },
+    upstream: true,
 }