diff options
| author | 2020-04-07 01:14:42 +0000 | |
|---|---|---|
| committer | 2020-04-07 01:14:42 +0000 | |
| commit | e8931d06ddeaa4e667f76e33fe0438a58e4d23e8 (patch) | |
| tree | db67fc44cbb5a0657d4079b9c6b2ac0949c6b5e2 | |
| parent | 55ace3ebb34bb6437778209baebbb5df700a7250 (diff) | |
| parent | a1d69738efff470f348c461a60cc8bec5d8cc4b0 (diff) | |
Merge "Rename vts-core to vts" into rvc-dev
| -rw-r--r-- | core/xsd/vts/Android.bp | 2 | ||||
| -rw-r--r-- | services/core/xsd/vts/Android.bp | 2 | ||||
| -rw-r--r-- | tests/ApkVerityTest/Android.bp | 2 | ||||
| -rw-r--r-- | tests/ApkVerityTest/block_device_writer/Android.bp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/core/xsd/vts/Android.bp b/core/xsd/vts/Android.bp index a2a2168c8377..ca655f18149c 100644 --- 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", } diff --git a/services/core/xsd/vts/Android.bp b/services/core/xsd/vts/Android.bp index 636d11069731..a942108667a5 100644 --- 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", } diff --git a/tests/ApkVerityTest/Android.bp b/tests/ApkVerityTest/Android.bp index 248206817740..02c75edafcd5 100644 --- 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", ], diff --git a/tests/ApkVerityTest/block_device_writer/Android.bp b/tests/ApkVerityTest/block_device_writer/Android.bp index 2760fe8df2d8..37fbc29470f6 100644 --- 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, } |