commit fbeb10d9427a902cd6ca46c951f32c85102da0a0
author Chaitanya Cheemala (xWF) <ccheemala@google.com> Mon Dec 30 04:36:18 2024 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 30 04:36:18 2024 -0800
tree eaf9d9b8483ed8e2dedf07bd9eef74811cacbef3
parent 90c77b8f7e3ebdadb385b0ae114dd43894318044
parent b1a4d24390c7d6eebd83535f6c4a1e049380778a

Merge "Revert "Add *.GTS variants of our tests"" into main am: 3d01dc0751 am: b1a4d24390

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3433981

Change-Id: Ia18b2af2669b9c87e0546204f8774cf2e9fbbfdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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"],