Merge "Rename vts-core to vts" into rvc-dev

2020-04-07 01:14:42 +00:00
parent 55ace3ebb3 a1d69738ef
commit e8931d06dd
4 changed files with 4 additions and 4 deletions
--- a/core/xsd/vts/Android.bp
+++ b/core/xsd/vts/Android.bp
@@ -36,7 +36,7 @@ cc_test {
    ],
    test_suites: [
        "general-tests",
-        "vts-core"
+        "vts"
    ],
    test_config: "vts_permission_validate_test.xml",
 }
--- a/services/core/xsd/vts/Android.bp
+++ b/services/core/xsd/vts/Android.bp
@@ -36,7 +36,7 @@ cc_test {
    ],
    test_suites: [
        "general-tests",
-        "vts-core"
+        "vts"
    ],
    test_config: "vts_defaultPermissions_validate_test.xml",
 }
--- a/tests/ApkVerityTest/Android.bp
+++ b/tests/ApkVerityTest/Android.bp
@@ -16,7 +16,7 @@ java_test_host {
    name: "ApkVerityTest",
    srcs: ["src/**/*.java"],
    libs: ["tradefed", "compatibility-tradefed", "compatibility-host-util"],
-    test_suites: ["general-tests", "vts-core"],
+    test_suites: ["general-tests", "vts"],
    target_required: [
        "block_device_writer_module",
    ],
--- a/tests/ApkVerityTest/block_device_writer/Android.bp
+++ b/tests/ApkVerityTest/block_device_writer/Android.bp
@@ -48,6 +48,6 @@ cc_test {
    },

    auto_gen_config: false,
-    test_suites: ["general-tests", "pts", "vts-core"],
+    test_suites: ["general-tests", "pts", "vts"],
    gtest: false,
 }