Removing upstream flag as it is now the default.
Also moving to internal robolectric projects to no longer use the _upstream suffix.
Test: CI
Bug: 386652866
Change-Id: I605ae9e5833d5539aff64a672b24b836f4b27ff0
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index ae00673..a05c910 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -35,7 +35,7 @@
"mockito-robolectric-prebuilt",
"tv-lib-truth",
"androidx.test.uiautomator_uiautomator",
- "Robolectric_all-target_upstream",
+ "Robolectric_all-target",
],
// Link tv-common as shared library to avoid the problem of initialization of the constants
@@ -60,7 +60,7 @@
"src/com/android/tv/testing/shadows/**/*.java",
],
static_libs: [
- "Robolectric_all-target_upstream",
+ "Robolectric_all-target",
"mockito-robolectric-prebuilt",
"tv-test-common",
],
