Snap for 11238696 from b71fb7bc6d2e40911891ac653798825f0277b40f to sdk-release

Change-Id: I29da6e8cda49bab0e8fd5146b280575af5c0adf0

6 files changed, 5 insertions, 17 deletions

diff --git a/common/tests/robotests/Android.bp b/common/tests/robotests/Android.bp
index babaf7d0..4ce4e3df 100644
--- a/common/tests/robotests/Android.bp
+++ b/common/tests/robotests/Android.bp
@@ -28,9 +28,6 @@ android_robolectric_test {
     ],
     java_resource_dirs: ["config"],
     libs: [
-        "robolectric_android-all-stub",
-        "Robolectric_all-target",
-        "mockito-robolectric-prebuilt",
         "diffutils-prebuilt-jar",
     ],
     static_libs: [
@@ -47,4 +44,5 @@ android_robolectric_test {
     test_options: {
         timeout: 36000,
     },
+    upstream: true,
 }
diff --git a/tests/common/Android.bp b/tests/common/Android.bp
index f1f15263..4155876b 100644
--- a/tests/common/Android.bp
+++ b/tests/common/Android.bp
@@ -35,7 +35,7 @@ android_library {
         "mockito-robolectric-prebuilt",
         "tv-lib-truth",
         "androidx.test.uiautomator_uiautomator",
-        "Robolectric_all-target",
+        "Robolectric_all-target_upstream",
     ],
 
     // Link tv-common as shared library to avoid the problem of initialization of the constants
@@ -61,7 +61,7 @@ android_library {
     ],
     static_libs: [
         "robolectric_android-all-stub",
-        "Robolectric_all-target",
+        "Robolectric_all-target_upstream",
         "mockito-robolectric-prebuilt",
         "tv-test-common",
     ],
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index a89f38fe..02015bed 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -30,11 +30,6 @@ android_robolectric_test {
         "src/com/android/tv/data/epg/EpgFetcherImplTest.java",
         "src/com/android/tv/guide/ProgramItemViewTest.java",
     ],
-    libs: [
-        "Robolectric_all-target",
-        "mockito-robolectric-prebuilt",
-        "robolectric_android-all-stub",
-    ],
     static_libs: [
         "tv-lib-dagger",
         "tv-lib-truth",
@@ -54,4 +49,5 @@ android_robolectric_test {
     test_options: {
         timeout: 36000,
     },
+    upstream: true,
 }
diff --git a/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java b/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
index 93813c08..d1c16a8d 100644
--- a/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/tv/testing/TvRobolectricTestRunner.java
@@ -44,7 +44,6 @@ public class TvRobolectricTestRunner extends RobolectricTestRunner {
      * We are going to create our own custom manifest so that we can add multiple resource paths to
      * it. This lets us access resources in both Settings and SettingsLib in our tests.
      */
-    @Override
     protected AndroidManifest getAppManifest(Config config) {
         final String packageName = "com.android.tv";
 
diff --git a/tuner/tests/robotests/Android.bp b/tuner/tests/robotests/Android.bp
index 99926e74..a1baf651 100644
--- a/tuner/tests/robotests/Android.bp
+++ b/tuner/tests/robotests/Android.bp
@@ -27,11 +27,6 @@ android_robolectric_test {
         "javatests/**/*.java",
     ],
     java_resource_dirs: ["config"],
-    libs: [
-        "robolectric_android-all-stub",
-        "Robolectric_all-target",
-        "mockito-robolectric-prebuilt",
-    ],
     static_libs: [
         "tv-lib-dagger",
         "androidx.test.core",
@@ -48,4 +43,5 @@ android_robolectric_test {
     test_options: {
         timeout: 36000,
     },
+    upstream: true,
 }
diff --git a/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java b/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java
index 89b7510d..ab0955e5 100644
--- a/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java
+++ b/tuner/tests/robotests/javatests/com/android/tv/tuner/testing/TvTunerRobolectricTestRunner.java
@@ -44,7 +44,6 @@ public class TvTunerRobolectricTestRunner extends RobolectricTestRunner {
      * We are going to create our own custom manifest so that we can add multiple resource paths to
      * it.
      */
-    @Override
     protected AndroidManifest getAppManifest(Config config) {
         final String packageName = "com.android.tv.tuner";