diff options
127 files changed, 144 insertions, 144 deletions
diff --git a/atrace/1.0/vts/functional/Android.bp b/atrace/1.0/vts/functional/Android.bp index ae24968aba..07d3f7fedf 100644 --- a/atrace/1.0/vts/functional/Android.bp +++ b/atrace/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalAtraceV1_0TargetTest.cpp"], static_libs: ["android.hardware.atrace@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/audio/core/all-versions/vts/functional/Android.bp b/audio/core/all-versions/vts/functional/Android.bp index db52e6095f..2d5e8a5c92 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -33,7 +33,7 @@ cc_defaults { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } @@ -55,7 +55,7 @@ cc_test { data: [ ":audio_policy_configuration_V2_0", ], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioV2_0TargetTest.xml", } @@ -78,7 +78,7 @@ cc_test { data: [ ":audio_policy_configuration_V4_0", ], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioV4_0TargetTest.xml", } @@ -101,7 +101,7 @@ cc_test { data: [ ":audio_policy_configuration_V5_0", ], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioV5_0TargetTest.xml", } @@ -124,7 +124,7 @@ cc_test { data: [ ":audio_policy_configuration_V6_0", ], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioV6_0TargetTest.xml", } diff --git a/audio/effect/all-versions/vts/functional/Android.bp b/audio/effect/all-versions/vts/functional/Android.bp index 4ab572e6ed..309aa9d27f 100644 --- a/audio/effect/all-versions/vts/functional/Android.bp +++ b/audio/effect/all-versions/vts/functional/Android.bp @@ -31,13 +31,13 @@ cc_defaults { header_libs: [ "android.hardware.audio.common.util@all-versions", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_test { name: "VtsHalAudioEffectV2_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV2_0TargetTest.xml", static_libs: [ @@ -57,7 +57,7 @@ cc_test { cc_test { name: "VtsHalAudioEffectV4_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV4_0TargetTest.xml", static_libs: [ @@ -77,7 +77,7 @@ cc_test { cc_test { name: "VtsHalAudioEffectV5_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV5_0TargetTest.xml", static_libs: [ @@ -97,7 +97,7 @@ cc_test { cc_test { name: "VtsHalAudioEffectV6_0TargetTest", defaults: ["VtsHalAudioEffectTargetTest_default"], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioEffectV6_0TargetTest.xml", static_libs: [ diff --git a/audio/policy/1.0/vts/functional/Android.bp b/audio/policy/1.0/vts/functional/Android.bp index b50e501d15..a5ddee51ef 100644 --- a/audio/policy/1.0/vts/functional/Android.bp +++ b/audio/policy/1.0/vts/functional/Android.bp @@ -24,7 +24,7 @@ cc_test { shared_libs: [ "libaudiofoundation", ], - // Use test_config for vts-core suite. + // Use test_config for vts suite. // TODO(b/146104851): Add auto-gen rules and remove it. test_config: "VtsHalAudioPolicyV1_0TargetTest.xml", cflags: [ @@ -54,6 +54,6 @@ cc_test { gtest: true, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/authsecret/1.0/vts/functional/Android.bp b/authsecret/1.0/vts/functional/Android.bp index 9ce9cda2f9..c49d37492d 100644 --- a/authsecret/1.0/vts/functional/Android.bp +++ b/authsecret/1.0/vts/functional/Android.bp @@ -21,7 +21,7 @@ cc_test { static_libs: ["android.hardware.authsecret@1.0"], test_suites: [ "general-tests", - "vts-core", + "vts", ], require_root: true, } diff --git a/automotive/audiocontrol/2.0/vts/functional/Android.bp b/automotive/audiocontrol/2.0/vts/functional/Android.bp index 520b042e37..ac20509dd5 100644 --- a/automotive/audiocontrol/2.0/vts/functional/Android.bp +++ b/automotive/audiocontrol/2.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/automotive/evs/1.0/vts/functional/Android.bp b/automotive/evs/1.0/vts/functional/Android.bp index 9f7cd3f02a..74d512293b 100644 --- a/automotive/evs/1.0/vts/functional/Android.bp +++ b/automotive/evs/1.0/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "android.hardware.automotive.evs@1.0", "android.hardware.automotive.evs@common-default-lib", ], - test_suites: ["vts-core"], + test_suites: ["vts"], cflags: [ "-O0", "-g", diff --git a/automotive/evs/1.1/vts/functional/Android.bp b/automotive/evs/1.1/vts/functional/Android.bp index 086a199ca5..d61f0a8f9c 100644 --- a/automotive/evs/1.1/vts/functional/Android.bp +++ b/automotive/evs/1.1/vts/functional/Android.bp @@ -38,7 +38,7 @@ cc_test { "android.hardware.graphics.common@1.2", "android.hardware.camera.device@3.2", ], - test_suites: ["vts-core"], + test_suites: ["vts"], cflags: [ "-O0", "-g", diff --git a/automotive/occupant_awareness/aidl/vts/functional/Android.bp b/automotive/occupant_awareness/aidl/vts/functional/Android.bp index 1256b69c67..514b0afc2b 100644 --- a/automotive/occupant_awareness/aidl/vts/functional/Android.bp +++ b/automotive/occupant_awareness/aidl/vts/functional/Android.bp @@ -12,6 +12,6 @@ cc_test { "android.hardware.automotive.occupant_awareness-cpp", ], test_suites: [ - "vts-core", + "vts", ], } diff --git a/automotive/sv/1.0/vts/functional/Android.bp b/automotive/sv/1.0/vts/functional/Android.bp index 0e5d3df9a7..d5d72a6c5b 100644 --- a/automotive/sv/1.0/vts/functional/Android.bp +++ b/automotive/sv/1.0/vts/functional/Android.bp @@ -33,7 +33,7 @@ cc_test { "android.hidl.memory@1.0", "libhidlmemory", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], cflags: [ "-O0", "-g", diff --git a/biometrics/face/1.0/vts/functional/Android.bp b/biometrics/face/1.0/vts/functional/Android.bp index f2598a7934..ff4a6de889 100644 --- a/biometrics/face/1.0/vts/functional/Android.bp +++ b/biometrics/face/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBiometricsFaceV1_0TargetTest.cpp"], static_libs: ["android.hardware.biometrics.face@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/biometrics/face/1.1/vts/functional/Android.bp b/biometrics/face/1.1/vts/functional/Android.bp index ccbb3994e1..aa0b1fa082 100644 --- a/biometrics/face/1.1/vts/functional/Android.bp +++ b/biometrics/face/1.1/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/biometrics/fingerprint/2.1/vts/functional/Android.bp b/biometrics/fingerprint/2.1/vts/functional/Android.bp index c4180322b8..7e3f3406bb 100644 --- a/biometrics/fingerprint/2.1/vts/functional/Android.bp +++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"], static_libs: ["android.hardware.biometrics.fingerprint@2.1"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/biometrics/fingerprint/2.2/vts/functional/Android.bp b/biometrics/fingerprint/2.2/vts/functional/Android.bp index 496570c64c..5e8e7c80be 100644 --- a/biometrics/fingerprint/2.2/vts/functional/Android.bp +++ b/biometrics/fingerprint/2.2/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index cf25cc8ff9..463ed849f6 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/bluetooth/1.1/vts/functional/Android.bp b/bluetooth/1.1/vts/functional/Android.bp index 8d6d7490e3..eb4a720f95 100644 --- a/bluetooth/1.1/vts/functional/Android.bp +++ b/bluetooth/1.1/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.bluetooth@1.0", "libbluetooth-types", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/bluetooth/a2dp/1.0/vts/functional/Android.bp b/bluetooth/a2dp/1.0/vts/functional/Android.bp index 5b8410adc5..df18fcc7c5 100644 --- a/bluetooth/a2dp/1.0/vts/functional/Android.bp +++ b/bluetooth/a2dp/1.0/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.bluetooth.a2dp@1.0", "libbluetooth-types", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/bluetooth/audio/2.0/vts/functional/Android.bp b/bluetooth/audio/2.0/vts/functional/Android.bp index b778b97b09..0ed5da43f2 100644 --- a/bluetooth/audio/2.0/vts/functional/Android.bp +++ b/bluetooth/audio/2.0/vts/functional/Android.bp @@ -9,5 +9,5 @@ cc_test { shared_libs: [ "libfmq", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp index 5244b958ca..92c818c56c 100644 --- a/boot/1.0/vts/functional/Android.bp +++ b/boot/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBootV1_0TargetTest.cpp"], static_libs: ["android.hardware.boot@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/broadcastradio/2.0/vts/functional/Android.bp b/broadcastradio/2.0/vts/functional/Android.bp index 49bb66554f..be17da32df 100644 --- a/broadcastradio/2.0/vts/functional/Android.bp +++ b/broadcastradio/2.0/vts/functional/Android.bp @@ -27,6 +27,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index 4b9d6f125b..cd66f74571 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -49,5 +49,5 @@ cc_test { "libhidlmemory", "libgralloctypes", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/cas/1.0/vts/functional/Android.bp b/cas/1.0/vts/functional/Android.bp index ab39c0e93b..82dc568fa6 100644 --- a/cas/1.0/vts/functional/Android.bp +++ b/cas/1.0/vts/functional/Android.bp @@ -29,6 +29,6 @@ cc_test { shared_libs: [ "libbinder", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/cas/1.1/vts/functional/Android.bp b/cas/1.1/vts/functional/Android.bp index 9e8eb52efe..de223c8ce2 100644 --- a/cas/1.1/vts/functional/Android.bp +++ b/cas/1.1/vts/functional/Android.bp @@ -30,6 +30,6 @@ cc_test { shared_libs: [ "libbinder", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/cas/1.2/vts/functional/Android.bp b/cas/1.2/vts/functional/Android.bp index 2d6517f0b0..74ea85fbf2 100644 --- a/cas/1.2/vts/functional/Android.bp +++ b/cas/1.2/vts/functional/Android.bp @@ -33,6 +33,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/configstore/1.0/vts/functional/Android.bp b/configstore/1.0/vts/functional/Android.bp index 31d4b1c9d9..4e1e045dd1 100644 --- a/configstore/1.0/vts/functional/Android.bp +++ b/configstore/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"], static_libs: ["android.hardware.configstore@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/confirmationui/1.0/vts/functional/Android.bp b/confirmationui/1.0/vts/functional/Android.bp index c8b522c119..c73ee2826c 100644 --- a/confirmationui/1.0/vts/functional/Android.bp +++ b/confirmationui/1.0/vts/functional/Android.bp @@ -27,5 +27,5 @@ cc_test { "libcn-cbor", "android.hardware.confirmationui-support-lib", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/contexthub/1.0/vts/functional/Android.bp b/contexthub/1.0/vts/functional/Android.bp index d51c9669c8..091f2dc201 100644 --- a/contexthub/1.0/vts/functional/Android.bp +++ b/contexthub/1.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/contexthub/1.1/vts/functional/Android.bp b/contexthub/1.1/vts/functional/Android.bp index f1625a6b6b..034c11fb0c 100644 --- a/contexthub/1.1/vts/functional/Android.bp +++ b/contexthub/1.1/vts/functional/Android.bp @@ -25,6 +25,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index e4d3393272..0545c70606 100644 --- a/drm/1.0/vts/functional/Android.bp +++ b/drm/1.0/vts/functional/Android.bp @@ -100,6 +100,6 @@ cc_test { }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.1/vts/functional/Android.bp b/drm/1.1/vts/functional/Android.bp index c31aee0827..053a564023 100644 --- a/drm/1.1/vts/functional/Android.bp +++ b/drm/1.1/vts/functional/Android.bp @@ -81,6 +81,6 @@ cc_test { }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.2/vts/functional/Android.bp b/drm/1.2/vts/functional/Android.bp index 793ef801d9..271cc043d0 100644 --- a/drm/1.2/vts/functional/Android.bp +++ b/drm/1.2/vts/functional/Android.bp @@ -86,6 +86,6 @@ cc_test { }, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/drm/1.3/vts/functional/Android.bp b/drm/1.3/vts/functional/Android.bp index ac1f912c08..4ef94ec332 100644 --- a/drm/1.3/vts/functional/Android.bp +++ b/drm/1.3/vts/functional/Android.bp @@ -73,6 +73,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/dumpstate/1.0/vts/functional/Android.bp b/dumpstate/1.0/vts/functional/Android.bp index 3bac281598..451b0536fd 100644 --- a/dumpstate/1.0/vts/functional/Android.bp +++ b/dumpstate/1.0/vts/functional/Android.bp @@ -18,5 +18,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalDumpstateV1_0TargetTest.cpp"], static_libs: ["android.hardware.dumpstate@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/dumpstate/1.1/vts/functional/Android.bp b/dumpstate/1.1/vts/functional/Android.bp index 5267706c0b..43a3c21b7c 100644 --- a/dumpstate/1.1/vts/functional/Android.bp +++ b/dumpstate/1.1/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp index a115285392..1ca966d20f 100644 --- a/gatekeeper/1.0/vts/functional/Android.bp +++ b/gatekeeper/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"], static_libs: ["android.hardware.gatekeeper@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/gnss/1.0/vts/functional/Android.bp b/gnss/1.0/vts/functional/Android.bp index d73b32ea8b..45755e6671 100644 --- a/gnss/1.0/vts/functional/Android.bp +++ b/gnss/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGnssV1_0TargetTest.cpp"], static_libs: ["android.hardware.gnss@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/gnss/1.1/vts/functional/Android.bp b/gnss/1.1/vts/functional/Android.bp index 369a89da39..0d540b7250 100644 --- a/gnss/1.1/vts/functional/Android.bp +++ b/gnss/1.1/vts/functional/Android.bp @@ -33,6 +33,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/gnss/2.0/vts/functional/Android.bp b/gnss/2.0/vts/functional/Android.bp index da5289d006..d67677afe4 100644 --- a/gnss/2.0/vts/functional/Android.bp +++ b/gnss/2.0/vts/functional/Android.bp @@ -31,5 +31,5 @@ cc_test { "android.hardware.gnss@2.1", "android.hardware.gnss@common-vts-lib", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/gnss/2.1/vts/functional/Android.bp b/gnss/2.1/vts/functional/Android.bp index f008a26f1f..b3051d4b48 100644 --- a/gnss/2.1/vts/functional/Android.bp +++ b/gnss/2.1/vts/functional/Android.bp @@ -34,6 +34,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp index 5f1ed63936..dafbbf9c9e 100644 --- a/graphics/composer/2.1/vts/functional/Android.bp +++ b/graphics/composer/2.1/vts/functional/Android.bp @@ -43,5 +43,5 @@ cc_test { "android.hardware.graphics.composer@2.1-command-buffer", ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp index e38af00a38..e1a254dee4 100644 --- a/graphics/composer/2.2/vts/functional/Android.bp +++ b/graphics/composer/2.2/vts/functional/Android.bp @@ -61,6 +61,6 @@ cc_test { disable_framework: true, test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/graphics/composer/2.3/vts/functional/Android.bp b/graphics/composer/2.3/vts/functional/Android.bp index fa4823efbd..18ea2aa96c 100644 --- a/graphics/composer/2.3/vts/functional/Android.bp +++ b/graphics/composer/2.3/vts/functional/Android.bp @@ -50,5 +50,5 @@ cc_test { "android.hardware.graphics.composer@2.3-command-buffer", ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/composer/2.4/vts/functional/Android.bp b/graphics/composer/2.4/vts/functional/Android.bp index 937af3d4d2..9e7cc46c56 100644 --- a/graphics/composer/2.4/vts/functional/Android.bp +++ b/graphics/composer/2.4/vts/functional/Android.bp @@ -52,5 +52,5 @@ cc_test { "android.hardware.graphics.composer@2.4-command-buffer", ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp index a055b61b60..1f7ae04c15 100644 --- a/graphics/mapper/2.0/vts/functional/Android.bp +++ b/graphics/mapper/2.0/vts/functional/Android.bp @@ -24,5 +24,5 @@ cc_test { "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/2.1/vts/functional/Android.bp b/graphics/mapper/2.1/vts/functional/Android.bp index bb76c7452a..ccbe40fd96 100644 --- a/graphics/mapper/2.1/vts/functional/Android.bp +++ b/graphics/mapper/2.1/vts/functional/Android.bp @@ -26,5 +26,5 @@ cc_test { "android.hardware.graphics.mapper@2.0-vts", "android.hardware.graphics.mapper@2.1-vts", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/3.0/vts/functional/Android.bp b/graphics/mapper/3.0/vts/functional/Android.bp index f01670e299..3f4abecdd4 100644 --- a/graphics/mapper/3.0/vts/functional/Android.bp +++ b/graphics/mapper/3.0/vts/functional/Android.bp @@ -26,5 +26,5 @@ cc_test { "android.hardware.graphics.mapper@3.0", "android.hardware.graphics.mapper@3.0-vts", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/graphics/mapper/4.0/vts/functional/Android.bp b/graphics/mapper/4.0/vts/functional/Android.bp index 3542a6ee89..03abc891c0 100644 --- a/graphics/mapper/4.0/vts/functional/Android.bp +++ b/graphics/mapper/4.0/vts/functional/Android.bp @@ -36,6 +36,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/health/1.0/vts/functional/Android.bp b/health/1.0/vts/functional/Android.bp index be2d20685a..f4a04a7308 100644 --- a/health/1.0/vts/functional/Android.bp +++ b/health/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalHealthV1_0TargetTest.cpp"], static_libs: ["android.hardware.health@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/health/2.0/vts/functional/Android.bp b/health/2.0/vts/functional/Android.bp index 43571efaef..ab14ca75c3 100644 --- a/health/2.0/vts/functional/Android.bp +++ b/health/2.0/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.health@1.0", "android.hardware.health@2.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/health/2.1/vts/functional/Android.bp b/health/2.1/vts/functional/Android.bp index 17472fa2fa..7894ca24a8 100644 --- a/health/2.1/vts/functional/Android.bp +++ b/health/2.1/vts/functional/Android.bp @@ -27,6 +27,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/health/storage/1.0/vts/functional/Android.bp b/health/storage/1.0/vts/functional/Android.bp index 4c703c571f..22010319a2 100644 --- a/health/storage/1.0/vts/functional/Android.bp +++ b/health/storage/1.0/vts/functional/Android.bp @@ -24,7 +24,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], test_config: "VtsHalHealthStorageV1_0TargetTest.config", } diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp index cecc814fdc..ef8beb4cdf 100644 --- a/identity/aidl/vts/Android.bp +++ b/identity/aidl/vts/Android.bp @@ -17,6 +17,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/input/classifier/1.0/vts/functional/Android.bp b/input/classifier/1.0/vts/functional/Android.bp index 4db1398778..4d6c9c367e 100644 --- a/input/classifier/1.0/vts/functional/Android.bp +++ b/input/classifier/1.0/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index f9edebdb96..160129f8c5 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -21,5 +21,5 @@ cc_test { static_libs: [ "android.hardware.ir@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp index 36a6861a7d..35b9387132 100644 --- a/keymaster/3.0/vts/functional/Android.bp +++ b/keymaster/3.0/vts/functional/Android.bp @@ -29,5 +29,5 @@ cc_test { "libcrypto_static", "libsoftkeymasterdevice", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp index db500805dc..e706c689e6 100644 --- a/keymaster/4.0/vts/functional/Android.bp +++ b/keymaster/4.0/vts/functional/Android.bp @@ -30,7 +30,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/keymaster/4.1/vts/functional/Android.bp b/keymaster/4.1/vts/functional/Android.bp index c2d7fa3547..5ba05ea4ef 100644 --- a/keymaster/4.1/vts/functional/Android.bp +++ b/keymaster/4.1/vts/functional/Android.bp @@ -37,6 +37,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/light/2.0/vts/functional/Android.bp b/light/2.0/vts/functional/Android.bp index 2c0a08fab4..06590c3a15 100644 --- a/light/2.0/vts/functional/Android.bp +++ b/light/2.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalLightV2_0TargetTest.cpp"], static_libs: ["android.hardware.light@2.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/light/aidl/vts/functional/Android.bp b/light/aidl/vts/functional/Android.bp index 3dd8cf64ce..aa4719b739 100644 --- a/light/aidl/vts/functional/Android.bp +++ b/light/aidl/vts/functional/Android.bp @@ -30,6 +30,6 @@ cc_test { "android.hardware.light-cpp", ], test_suites: [ - "vts-core", + "vts", ], } diff --git a/media/omx/1.0/vts/functional/audio/Android.bp b/media/omx/1.0/vts/functional/audio/Android.bp index 532521e0fe..ec7357cb3d 100644 --- a/media/omx/1.0/vts/functional/audio/Android.bp +++ b/media/omx/1.0/vts/functional/audio/Android.bp @@ -25,7 +25,7 @@ cc_test { data: [":media_omx_audio_res"], test_config: "VtsHalMediaOmxV1_0TargetAudioEncTest.xml", test_suites: [ - "vts-core", + "vts", ], } @@ -40,6 +40,6 @@ cc_test { data: [":media_omx_audio_res"], test_config: "VtsHalMediaOmxV1_0TargetAudioDecTest.xml", test_suites: [ - "vts-core", + "vts", ], } diff --git a/media/omx/1.0/vts/functional/component/Android.bp b/media/omx/1.0/vts/functional/component/Android.bp index c7be2cc8d9..8fb627ad42 100644 --- a/media/omx/1.0/vts/functional/component/Android.bp +++ b/media/omx/1.0/vts/functional/component/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: ["VtsHalMediaOmxV1_0TargetComponentTest.cpp"], test_suites: [ - "vts-core", + "vts", ], } diff --git a/media/omx/1.0/vts/functional/master/Android.bp b/media/omx/1.0/vts/functional/master/Android.bp index 0eb2cc998d..8e58821e12 100644 --- a/media/omx/1.0/vts/functional/master/Android.bp +++ b/media/omx/1.0/vts/functional/master/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: ["VtsHalMediaOmxV1_0TargetMasterTest.cpp"], test_suites: [ - "vts-core", + "vts", ], } diff --git a/media/omx/1.0/vts/functional/video/Android.bp b/media/omx/1.0/vts/functional/video/Android.bp index 7e93faa261..b35c26c0f3 100644 --- a/media/omx/1.0/vts/functional/video/Android.bp +++ b/media/omx/1.0/vts/functional/video/Android.bp @@ -25,7 +25,7 @@ cc_test { data: [":media_omx_video_res"], test_config: "VtsHalMediaOmxV1_0TargetVideoDecTest.xml", test_suites: [ - "vts-core", + "vts", ], } @@ -43,6 +43,6 @@ cc_test { data: [":media_omx_video_res"], test_config: "VtsHalMediaOmxV1_0TargetVideoEncTest.xml", test_suites: [ - "vts-core", + "vts", ], } diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp index 9e5cf6dc37..445770ad9b 100644 --- a/memtrack/1.0/vts/functional/Android.bp +++ b/memtrack/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"], static_libs: ["android.hardware.memtrack@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp index 03af671086..87e851930d 100644 --- a/neuralnetworks/1.0/vts/functional/Android.bp +++ b/neuralnetworks/1.0/vts/functional/Android.bp @@ -88,5 +88,5 @@ cc_test { header_libs: [ "libneuralnetworks_headers", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/neuralnetworks/1.1/vts/functional/Android.bp b/neuralnetworks/1.1/vts/functional/Android.bp index 9ba192518a..9afa0af35b 100644 --- a/neuralnetworks/1.1/vts/functional/Android.bp +++ b/neuralnetworks/1.1/vts/functional/Android.bp @@ -47,5 +47,5 @@ cc_test { header_libs: [ "libneuralnetworks_headers", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp index 7c1faeef68..481eb80258 100644 --- a/neuralnetworks/1.2/vts/functional/Android.bp +++ b/neuralnetworks/1.2/vts/functional/Android.bp @@ -72,6 +72,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index 40b82bbf98..40ba22ee2f 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -21,5 +21,5 @@ cc_test { static_libs: [ "android.hardware.nfc@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/nfc/1.1/vts/functional/Android.bp b/nfc/1.1/vts/functional/Android.bp index 8da0ce3a78..1c18418514 100644 --- a/nfc/1.1/vts/functional/Android.bp +++ b/nfc/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.nfc@1.0", "android.hardware.nfc@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/nfc/1.2/vts/functional/Android.bp b/nfc/1.2/vts/functional/Android.bp index 7b50a36d74..83e7a8e58e 100644 --- a/nfc/1.2/vts/functional/Android.bp +++ b/nfc/1.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.nfc@1.1", "android.hardware.nfc@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/oemlock/1.0/vts/functional/Android.bp b/oemlock/1.0/vts/functional/Android.bp index 90de347562..4dd92b53d6 100644 --- a/oemlock/1.0/vts/functional/Android.bp +++ b/oemlock/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalOemLockV1_0TargetTest.cpp"], static_libs: ["android.hardware.oemlock@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.0/vts/functional/Android.bp b/power/1.0/vts/functional/Android.bp index 5d5676d36b..27b945651c 100644 --- a/power/1.0/vts/functional/Android.bp +++ b/power/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalPowerV1_0TargetTest.cpp"], static_libs: ["android.hardware.power@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.1/vts/functional/Android.bp b/power/1.1/vts/functional/Android.bp index d9a32df9ab..2860fdb10a 100644 --- a/power/1.1/vts/functional/Android.bp +++ b/power/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.power@1.0", "android.hardware.power@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.2/vts/functional/Android.bp b/power/1.2/vts/functional/Android.bp index 5385faa8a8..5d1b2a4973 100644 --- a/power/1.2/vts/functional/Android.bp +++ b/power/1.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.power@1.1", "android.hardware.power@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/1.3/vts/functional/Android.bp b/power/1.3/vts/functional/Android.bp index 77e86197a0..d8e1c050ad 100644 --- a/power/1.3/vts/functional/Android.bp +++ b/power/1.3/vts/functional/Android.bp @@ -24,5 +24,5 @@ cc_test { "android.hardware.power@1.2", "android.hardware.power@1.3", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/power/aidl/vts/Android.bp b/power/aidl/vts/Android.bp index 7726fd8a73..28b08c7c4e 100644 --- a/power/aidl/vts/Android.bp +++ b/power/aidl/vts/Android.bp @@ -26,6 +26,6 @@ cc_test { "android.hardware.power-cpp", ], test_suites: [ - "vts-core", + "vts", ], } diff --git a/power/stats/1.0/vts/functional/Android.bp b/power/stats/1.0/vts/functional/Android.bp index ab47061461..d5f1da2d9d 100644 --- a/power/stats/1.0/vts/functional/Android.bp +++ b/power/stats/1.0/vts/functional/Android.bp @@ -33,5 +33,5 @@ cc_test { "libfmq", "libutils", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 2351d903fa..13fc5425ac 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -34,7 +34,7 @@ cc_test { "android.hardware.radio@1.0", ], test_config: "vts_hal_radio_target_test.xml", - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_test { @@ -49,7 +49,7 @@ cc_test { "android.hardware.radio@1.0", ], test_config: "vts_hal_sap_target_test.xml", - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_library_static { diff --git a/radio/1.1/vts/functional/Android.bp b/radio/1.1/vts/functional/Android.bp index 58aa67e0f9..e1278b926a 100644 --- a/radio/1.1/vts/functional/Android.bp +++ b/radio/1.1/vts/functional/Android.bp @@ -30,5 +30,5 @@ cc_test { header_libs: [ "radio.util.header@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.2/vts/functional/Android.bp b/radio/1.2/vts/functional/Android.bp index f7189a8cbd..56f2d5fb49 100644 --- a/radio/1.2/vts/functional/Android.bp +++ b/radio/1.2/vts/functional/Android.bp @@ -34,5 +34,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.3/vts/functional/Android.bp b/radio/1.3/vts/functional/Android.bp index 2301732331..e32258f5d3 100644 --- a/radio/1.3/vts/functional/Android.bp +++ b/radio/1.3/vts/functional/Android.bp @@ -32,5 +32,5 @@ cc_test { "android.hardware.radio@1.0", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/1.4/vts/functional/Android.bp b/radio/1.4/vts/functional/Android.bp index 82844048b6..369b55b7a2 100644 --- a/radio/1.4/vts/functional/Android.bp +++ b/radio/1.4/vts/functional/Android.bp @@ -35,5 +35,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"] + test_suites: ["general-tests", "vts"] } diff --git a/radio/1.5/vts/functional/Android.bp b/radio/1.5/vts/functional/Android.bp index cd30f7dd39..cd54d274fd 100644 --- a/radio/1.5/vts/functional/Android.bp +++ b/radio/1.5/vts/functional/Android.bp @@ -36,5 +36,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"] + test_suites: ["general-tests", "vts"] } diff --git a/radio/config/1.0/vts/functional/Android.bp b/radio/config/1.0/vts/functional/Android.bp index 859b24bde9..330209eed0 100644 --- a/radio/config/1.0/vts/functional/Android.bp +++ b/radio/config/1.0/vts/functional/Android.bp @@ -29,5 +29,5 @@ cc_test { "android.hardware.radio.config@1.0", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/config/1.1/vts/functional/Android.bp b/radio/config/1.1/vts/functional/Android.bp index 8cf7b629a5..f60331d1c3 100644 --- a/radio/config/1.1/vts/functional/Android.bp +++ b/radio/config/1.1/vts/functional/Android.bp @@ -29,5 +29,5 @@ cc_test { "android.hardware.radio.config@1.1", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/radio/config/1.2/vts/functional/Android.bp b/radio/config/1.2/vts/functional/Android.bp index 2c2073a214..fdc83b73fc 100644 --- a/radio/config/1.2/vts/functional/Android.bp +++ b/radio/config/1.2/vts/functional/Android.bp @@ -31,5 +31,5 @@ cc_test { "android.hardware.radio.config@1.2", ], header_libs: ["radio.util.header@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/rebootescrow/aidl/vts/functional/Android.bp b/rebootescrow/aidl/vts/functional/Android.bp index 5d51a53f06..2cc00685d6 100644 --- a/rebootescrow/aidl/vts/functional/Android.bp +++ b/rebootescrow/aidl/vts/functional/Android.bp @@ -28,7 +28,7 @@ cc_test { "android.hardware.rebootescrow-cpp", ], test_suites: [ - "vts-core", + "vts", ], require_root: true, } diff --git a/renderscript/1.0/vts/functional/Android.bp b/renderscript/1.0/vts/functional/Android.bp index e3716e01b1..327c09edb5 100644 --- a/renderscript/1.0/vts/functional/Android.bp +++ b/renderscript/1.0/vts/functional/Android.bp @@ -28,5 +28,5 @@ cc_test { "android.hardware.renderscript@1.0", "libnativewindow", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/secure_element/1.0/vts/functional/Android.bp b/secure_element/1.0/vts/functional/Android.bp index 6dbd027747..d428c6f771 100644 --- a/secure_element/1.0/vts/functional/Android.bp +++ b/secure_element/1.0/vts/functional/Android.bp @@ -21,5 +21,5 @@ cc_test { static_libs: [ "android.hardware.secure_element@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/secure_element/1.1/vts/functional/Android.bp b/secure_element/1.1/vts/functional/Android.bp index a2c39dc973..200aed829d 100644 --- a/secure_element/1.1/vts/functional/Android.bp +++ b/secure_element/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.secure_element@1.0", "android.hardware.secure_element@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/secure_element/1.2/vts/functional/Android.bp b/secure_element/1.2/vts/functional/Android.bp index a1732108ab..9a7ca45b54 100644 --- a/secure_element/1.2/vts/functional/Android.bp +++ b/secure_element/1.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.secure_element@1.1", "android.hardware.secure_element@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/sensors/1.0/vts/functional/Android.bp b/sensors/1.0/vts/functional/Android.bp index aaefccbe19..31424abb79 100644 --- a/sensors/1.0/vts/functional/Android.bp +++ b/sensors/1.0/vts/functional/Android.bp @@ -33,6 +33,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/sensors/2.0/vts/functional/Android.bp b/sensors/2.0/vts/functional/Android.bp index 08c59b6378..598ad15923 100644 --- a/sensors/2.0/vts/functional/Android.bp +++ b/sensors/2.0/vts/functional/Android.bp @@ -40,6 +40,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/sensors/2.1/vts/functional/Android.bp b/sensors/2.1/vts/functional/Android.bp index c4f5e9d2d7..3f01a3ec84 100644 --- a/sensors/2.1/vts/functional/Android.bp +++ b/sensors/2.1/vts/functional/Android.bp @@ -42,6 +42,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/soundtrigger/2.0/vts/functional/Android.bp b/soundtrigger/2.0/vts/functional/Android.bp index 13dcdec69e..86697bda3d 100644 --- a/soundtrigger/2.0/vts/functional/Android.bp +++ b/soundtrigger/2.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"], static_libs: ["android.hardware.soundtrigger@2.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/soundtrigger/2.1/vts/functional/Android.bp b/soundtrigger/2.1/vts/functional/Android.bp index 7830fe2602..9de913b641 100644 --- a/soundtrigger/2.1/vts/functional/Android.bp +++ b/soundtrigger/2.1/vts/functional/Android.bp @@ -25,5 +25,5 @@ cc_test { "android.hardware.soundtrigger@2.1", "libhidlmemory" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/soundtrigger/2.2/vts/functional/Android.bp b/soundtrigger/2.2/vts/functional/Android.bp index b5d241d263..b7967d966f 100644 --- a/soundtrigger/2.2/vts/functional/Android.bp +++ b/soundtrigger/2.2/vts/functional/Android.bp @@ -23,5 +23,5 @@ cc_test { "android.hardware.soundtrigger@2.1", "android.hardware.soundtrigger@2.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/soundtrigger/2.3/vts/functional/Android.bp b/soundtrigger/2.3/vts/functional/Android.bp index e3855fc372..2c1b9e594e 100644 --- a/soundtrigger/2.3/vts/functional/Android.bp +++ b/soundtrigger/2.3/vts/functional/Android.bp @@ -26,6 +26,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/tetheroffload/config/1.0/vts/functional/Android.bp b/tetheroffload/config/1.0/vts/functional/Android.bp index 7b472e3e79..ad5a1b1af4 100644 --- a/tetheroffload/config/1.0/vts/functional/Android.bp +++ b/tetheroffload/config/1.0/vts/functional/Android.bp @@ -17,5 +17,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTetheroffloadConfigV1_0TargetTest.cpp"], static_libs: ["android.hardware.tetheroffload.config@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/tetheroffload/control/1.0/vts/functional/Android.bp b/tetheroffload/control/1.0/vts/functional/Android.bp index 4af59b66ed..c51dd8b08d 100644 --- a/tetheroffload/control/1.0/vts/functional/Android.bp +++ b/tetheroffload/control/1.0/vts/functional/Android.bp @@ -20,5 +20,5 @@ cc_test { "android.hardware.tetheroffload.config@1.0", "android.hardware.tetheroffload.control@1.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp index d183bd8a0e..5ccf07af17 100644 --- a/thermal/1.0/vts/functional/Android.bp +++ b/thermal/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalThermalV1_0TargetTest.cpp"], static_libs: ["android.hardware.thermal@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/thermal/1.1/vts/functional/Android.bp b/thermal/1.1/vts/functional/Android.bp index 2c43d79766..b869ece290 100644 --- a/thermal/1.1/vts/functional/Android.bp +++ b/thermal/1.1/vts/functional/Android.bp @@ -22,5 +22,5 @@ cc_test { "android.hardware.thermal@1.0", "android.hardware.thermal@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/thermal/2.0/vts/functional/Android.bp b/thermal/2.0/vts/functional/Android.bp index 09405763a2..026cb62577 100644 --- a/thermal/2.0/vts/functional/Android.bp +++ b/thermal/2.0/vts/functional/Android.bp @@ -22,6 +22,6 @@ cc_test { "android.hardware.thermal@1.0", "android.hardware.thermal@2.0", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/tv/input/1.0/vts/functional/Android.bp b/tv/input/1.0/vts/functional/Android.bp index 5d20bceeed..29d4e21de2 100644 --- a/tv/input/1.0/vts/functional/Android.bp +++ b/tv/input/1.0/vts/functional/Android.bp @@ -21,7 +21,7 @@ cc_test { static_libs: ["android.hardware.tv.input@1.0"], test_suites: [ "general-tests", - "vts-core", + "vts", ], require_root: true, } diff --git a/tv/tuner/1.0/vts/functional/Android.bp b/tv/tuner/1.0/vts/functional/Android.bp index 3637708a6a..641e16a937 100644 --- a/tv/tuner/1.0/vts/functional/Android.bp +++ b/tv/tuner/1.0/vts/functional/Android.bp @@ -32,7 +32,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], require_root: true, diff --git a/usb/1.0/vts/functional/Android.bp b/usb/1.0/vts/functional/Android.bp index 1a3b56b99c..ae31bd2d30 100644 --- a/usb/1.0/vts/functional/Android.bp +++ b/usb/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalUsbV1_0TargetTest.cpp"], static_libs: ["android.hardware.usb@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/usb/1.1/vts/functional/Android.bp b/usb/1.1/vts/functional/Android.bp index 32c470b096..5bec94af66 100644 --- a/usb/1.1/vts/functional/Android.bp +++ b/usb/1.1/vts/functional/Android.bp @@ -22,6 +22,6 @@ cc_test { "android.hardware.usb@1.0", "android.hardware.usb@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.0/vts/functional/Android.bp b/vibrator/1.0/vts/functional/Android.bp index 10ec2cbab6..4ec1aa8064 100644 --- a/vibrator/1.0/vts/functional/Android.bp +++ b/vibrator/1.0/vts/functional/Android.bp @@ -19,6 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVibratorV1_0TargetTest.cpp"], static_libs: ["android.hardware.vibrator@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.1/vts/functional/Android.bp b/vibrator/1.1/vts/functional/Android.bp index 4cde350e79..b291e7ce50 100644 --- a/vibrator/1.1/vts/functional/Android.bp +++ b/vibrator/1.1/vts/functional/Android.bp @@ -22,6 +22,6 @@ cc_test { "android.hardware.vibrator@1.0", "android.hardware.vibrator@1.1", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.2/vts/functional/Android.bp b/vibrator/1.2/vts/functional/Android.bp index e7052f2b6d..7bf69d06d3 100644 --- a/vibrator/1.2/vts/functional/Android.bp +++ b/vibrator/1.2/vts/functional/Android.bp @@ -23,6 +23,6 @@ cc_test { "android.hardware.vibrator@1.1", "android.hardware.vibrator@1.2", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/1.3/vts/functional/Android.bp b/vibrator/1.3/vts/functional/Android.bp index 038dc5ca59..5215ed04cf 100644 --- a/vibrator/1.3/vts/functional/Android.bp +++ b/vibrator/1.3/vts/functional/Android.bp @@ -24,6 +24,6 @@ cc_test { "android.hardware.vibrator@1.2", "android.hardware.vibrator@1.3", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/vibrator/aidl/vts/Android.bp b/vibrator/aidl/vts/Android.bp index d1e135e4a3..28cb4d9856 100644 --- a/vibrator/aidl/vts/Android.bp +++ b/vibrator/aidl/vts/Android.bp @@ -13,6 +13,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/vr/1.0/vts/functional/Android.bp b/vr/1.0/vts/functional/Android.bp index bd0336cc15..6bfa05cad7 100644 --- a/vr/1.0/vts/functional/Android.bp +++ b/vr/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVrV1_0TargetTest.cpp"], static_libs: ["android.hardware.vr@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/weaver/1.0/vts/functional/Android.bp b/weaver/1.0/vts/functional/Android.bp index 3942deb166..b20f127647 100644 --- a/weaver/1.0/vts/functional/Android.bp +++ b/weaver/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWeaverV1_0TargetTest.cpp"], static_libs: ["android.hardware.weaver@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index 2242510933..793dd8cc7c 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -51,7 +51,7 @@ cc_test { "android.hardware.wifi@1.3", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } // These tests are split out so that they can be conditioned on presence of the @@ -68,7 +68,7 @@ cc_test { "android.hardware.wifi@1.0", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } // These tests are split out so that they can be conditioned on presence of @@ -85,5 +85,5 @@ cc_test { "android.hardware.wifi@1.0", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.1/vts/functional/Android.bp b/wifi/1.1/vts/functional/Android.bp index d34ae222d9..eb68bc0ddc 100644 --- a/wifi/1.1/vts/functional/Android.bp +++ b/wifi/1.1/vts/functional/Android.bp @@ -27,5 +27,5 @@ cc_test { "android.hardware.wifi@1.3", "libwifi-system-iface" ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.2/vts/functional/Android.bp b/wifi/1.2/vts/functional/Android.bp index d3de5cfc67..90bcac1d33 100644 --- a/wifi/1.2/vts/functional/Android.bp +++ b/wifi/1.2/vts/functional/Android.bp @@ -30,7 +30,7 @@ cc_test { "libwifi-system-iface" ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } cc_test { @@ -47,5 +47,5 @@ cc_test { "libwifi-system-iface" ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.3/vts/functional/Android.bp b/wifi/1.3/vts/functional/Android.bp index 457de2973a..3568330845 100644 --- a/wifi/1.3/vts/functional/Android.bp +++ b/wifi/1.3/vts/functional/Android.bp @@ -30,5 +30,5 @@ cc_test { "libwifi-system-iface" ], disable_framework: true, - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/1.4/vts/functional/Android.bp b/wifi/1.4/vts/functional/Android.bp index 7e74cbd5de..3824c3aecf 100644 --- a/wifi/1.4/vts/functional/Android.bp +++ b/wifi/1.4/vts/functional/Android.bp @@ -35,6 +35,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/hostapd/1.0/vts/functional/Android.bp b/wifi/hostapd/1.0/vts/functional/Android.bp index e966d7e817..2a35f15190 100644 --- a/wifi/hostapd/1.0/vts/functional/Android.bp +++ b/wifi/hostapd/1.0/vts/functional/Android.bp @@ -48,5 +48,5 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/hostapd/1.1/vts/functional/Android.bp b/wifi/hostapd/1.1/vts/functional/Android.bp index 8670f2fe97..291eceb80c 100644 --- a/wifi/hostapd/1.1/vts/functional/Android.bp +++ b/wifi/hostapd/1.1/vts/functional/Android.bp @@ -30,6 +30,6 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/hostapd/1.2/vts/functional/Android.bp b/wifi/hostapd/1.2/vts/functional/Android.bp index 4f4a741bf3..cec17823fd 100644 --- a/wifi/hostapd/1.2/vts/functional/Android.bp +++ b/wifi/hostapd/1.2/vts/functional/Android.bp @@ -31,6 +31,6 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/offload/1.0/vts/functional/Android.bp b/wifi/offload/1.0/vts/functional/Android.bp index 965c946764..abfefa8214 100644 --- a/wifi/offload/1.0/vts/functional/Android.bp +++ b/wifi/offload/1.0/vts/functional/Android.bp @@ -19,5 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWifiOffloadV1_0TargetTest.cpp"], static_libs: ["android.hardware.wifi.offload@1.0"], - test_suites: ["general-tests", "vts-core"], + test_suites: ["general-tests", "vts"], } diff --git a/wifi/supplicant/1.0/vts/functional/Android.bp b/wifi/supplicant/1.0/vts/functional/Android.bp index a05cc6bfa8..6f282bb9d7 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.bp +++ b/wifi/supplicant/1.0/vts/functional/Android.bp @@ -54,7 +54,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } @@ -77,6 +77,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/supplicant/1.1/vts/functional/Android.bp b/wifi/supplicant/1.1/vts/functional/Android.bp index 90a3e872fb..44b020e021 100644 --- a/wifi/supplicant/1.1/vts/functional/Android.bp +++ b/wifi/supplicant/1.1/vts/functional/Android.bp @@ -55,6 +55,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/supplicant/1.2/vts/functional/Android.bp b/wifi/supplicant/1.2/vts/functional/Android.bp index 80f3658edd..c23585aaef 100644 --- a/wifi/supplicant/1.2/vts/functional/Android.bp +++ b/wifi/supplicant/1.2/vts/functional/Android.bp @@ -59,7 +59,7 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } @@ -85,6 +85,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } diff --git a/wifi/supplicant/1.3/vts/functional/Android.bp b/wifi/supplicant/1.3/vts/functional/Android.bp index 00a0bf7ee1..8eebed0586 100644 --- a/wifi/supplicant/1.3/vts/functional/Android.bp +++ b/wifi/supplicant/1.3/vts/functional/Android.bp @@ -62,6 +62,6 @@ cc_test { ], test_suites: [ "general-tests", - "vts-core", + "vts", ], } |