commit ccf197b3661f90bb6c85f9cf04b682886a6c73a5
author Rex Hoffman <rexhoffman@google.com> Wed Jan 08 12:17:27 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 08 12:17:27 2025 -0800
tree d9c265646e81d8353fa90c0f61b53f0c67c7657a
parent e9bc1949a9dc5abe0fae6506a16011749c5bcf0f
parent f4290c1d03003b502bebbf75e96e577452261036

Merge "Removing Dead Flag Test: CI Bug: 386652866" into main

tests/robotests/Android.bp

diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 7f33d14..552e8cc 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -102,8 +102,6 @@
         "SettingsLib-search",
     ],
 
-    upstream: true,
-
     strict_mode: false,
 }
 

tests/screenshot/Android.bp

diff --git a/tests/screenshot/Android.bp b/tests/screenshot/Android.bp
index f79d00f..d3f4160 100644
--- a/tests/screenshot/Android.bp
+++ b/tests/screenshot/Android.bp
@@ -72,7 +72,6 @@
         "truth",
     ],
 
-    upstream: true,
     instrumentation_for: "ScreenshotTestStub",
     java_resource_dirs: ["config"],
 }