commit 133ef9322ea01f6f0aeeedea3b21a83e8dd205ce
author Chaitanya Cheemala (xWF) <ccheemala@google.com> Mon Dec 30 02:24:57 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 30 02:24:57 2024 -0800
tree eccf81cec1fcbb3133c5986ecc7bee615f43c372
parent 27fc95184ab1ac3c9a67be17738ce6f4a917349f

Revert "Add *.GTS variants of our tests"

This reverts commit 27fc95184ab1ac3c9a67be17738ce6f4a917349f.

Reason for revert: Likely culprit for b/386743625  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I6b023f6387847440fe26fd154a769cfd7c4bb0ce

tests/hostside/Android.bp

diff --git a/tests/hostside/Android.bp b/tests/hostside/Android.bp
index d6ae36b..0966c20 100644
--- a/tests/hostside/Android.bp
+++ b/tests/hostside/Android.bp
@@ -86,15 +86,6 @@
     data_native_bins: BINS,
 }
 
-java_test_host {
-    name: "MicrodroidHostTestCases.GTS",
-    defaults: ["MicrodroidHostTestCases.default"],
-    test_config: ":MicrodroidHostTestCases.GTS.config",
-    test_suites: ["gts"],
-    device_common_data: DEVICE_DATA,
-    data_native_bins: BINS,
-}
-
 genrule {
     name: "MicrodroidHostTestCases.CTS.config",
     srcs: ["AndroidTest.xml"],
@@ -116,14 +107,3 @@
         "-e 's/MicrodroidHostTestCases.jar/MicrodroidHostTestCases.VTS.jar/' " +
         "$(in) > $(out)",
 }
-
-genrule {
-    name: "MicrodroidHostTestCases.GTS.config",
-    srcs: ["AndroidTest.xml"],
-    out: ["out.xml"],
-    cmd: "sed " +
-        "-e 's/<!-- PLACEHOLDER_FOR_ANNOTATION -->/" +
-        "<option name=\"include-annotation\" value=\"com.android.compatibility.common.util.GmsTest\" \\/>/' " +
-        "-e 's/MicrodroidHostTestCases.jar/MicrodroidHostTestCases.GTS.jar/' " +
-        "$(in) > $(out)",
-}

tests/testapk/Android.bp

diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 69a8044..cb374a5 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -95,15 +95,6 @@
     data: DATA,
 }
 
-android_test {
-    name: "MicrodroidTestApp.GTS",
-    defaults: ["MicrodroidVersionsTestAppDefaults"],
-    manifest: "AndroidManifestV5.xml",
-    test_suites: ["gts"],
-    test_config: ":MicrodroidTestApp.GTS.config",
-    data: DATA,
-}
-
 genrule {
     name: "MicrodroidTestApp.CTS.config",
     srcs: ["AndroidTest.xml"],
@@ -126,17 +117,6 @@
         "$(in) > $(out)",
 }
 
-genrule {
-    name: "MicrodroidTestApp.GTS.config",
-    srcs: ["AndroidTest.xml"],
-    out: ["out.xml"],
-    cmd: "sed " +
-        "-e 's/<!-- PLACEHOLDER_FOR_ANNOTATION -->/" +
-        "<option name=\"include-annotation\" value=\"com.android.compatibility.common.util.GmsTest\" \\/>/' " +
-        "-e 's/MicrodroidTestApp.apk/MicrodroidTestApp.GTS.apk/' " +
-        "$(in) > $(out)",
-}
-
 android_test_helper_app {
     name: "MicrodroidTestAppUpdated",
     defaults: ["MicrodroidVersionsTestAppDefaults"],