commit e6f0b196ed7e9efb32b9cf96eeb562f4f866155a
author Rex Hoffman <rexhoffman@google.com> Wed Mar 15 23:22:37 2023 +0000
committer Rex Hoffman <rexhoffman@google.com> Fri Mar 17 22:33:58 2023 +0000
tree aa5a79b88418a241a43117e10638232b69831bb9
parent 80dc27dc239a60b37ebf26e76d1d5eb94d5da993

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

Bug: 261728063
Test: atest with both robolectric tests.

same failures before/after

Change-Id: Idf0a9073287e98dce70c93910a50946940118305

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,
 }