From e6f0b196ed7e9efb32b9cf96eeb562f4f866155a Mon Sep 17 00:00:00 2001
From: Rex Hoffman <rexhoffman@google.com>
Date: Wed, 15 Mar 2023 23:22:37 +0000
Subject: [PATCH] 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
---
 .../clients/test_support/snippet_helper/tests/Android.bp       | 3 ++-
 nearby/tests/robotests/Android.bp                              | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 284d5c2020..ec0392c4b9 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 @@ android_robolectric_test {
         // timeout in seconds.
         timeout: 36000,
     },
-}
\ No newline at end of file
+    upstream: true,
+}
diff --git a/nearby/tests/robotests/Android.bp b/nearby/tests/robotests/Android.bp
index 56c0107515..70fa0c37f8 100644
--- a/nearby/tests/robotests/Android.bp
+++ b/nearby/tests/robotests/Android.bp
@@ -42,15 +42,14 @@ android_robolectric_test {
         "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,
 }