Snap for 6370344 from 387b9ee3f3bcd02ccd3e72ccbb21d641ce6d72aa to rvc-release

Change-Id: If69ff1d03d20c0368276bcd64dcf116aa1f0d7f0

2 files changed, 4 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 7d6abec..3d8ab5a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -61,7 +61,7 @@ python_test_host {
         ":vts_vndk_abi_dump_zip",
     ],
     test_suites: [
-        "vts-core",
+        "vts",
     ],
     test_config: "abi/vts_vndk_abi_test.xml",
 }
@@ -74,7 +74,7 @@ python_test_host {
         "dependency/vts_vndk_dependency_test.py",
     ],
     test_suites: [
-        "vts-core",
+        "vts",
     ],
     test_config: "dependency/vts_vndk_dependency_test.xml",
 }
@@ -87,7 +87,7 @@ python_test_host {
         "files/vts_vndk_files_test.py",
     ],
     test_suites: [
-        "vts-core",
+        "vts",
     ],
     test_config: "files/vts_vndk_files_test.xml",
 }
@@ -100,7 +100,7 @@ python_test_host {
         "open_libraries/vts_vndk_open_libraries_test.py",
     ],
     test_suites: [
-        "vts-core",
+        "vts",
     ],
     test_config: "open_libraries/vts_vndk_open_libraries_test.xml",
 }
diff --git a/files/vts_vndk_files_test.xml b/files/vts_vndk_files_test.xml
index 4813916..c2a4d9a 100644
--- a/files/vts_vndk_files_test.xml
+++ b/files/vts_vndk_files_test.xml
@@ -15,7 +15,6 @@
 -->
 <configuration description="Config for vts_vndk_files_test">
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
-    <option name="test-suite-tag" value="vts-core" />
     <test class="com.android.tradefed.testtype.python.PythonBinaryHostTest">
         <option name="par-file-name" value="vts_vndk_files_test" />
         <option name="test-timeout" value="2m" />