diff options
85 files changed, 97 insertions, 9 deletions
diff --git a/atrace/1.0/vts/functional/Android.bp b/atrace/1.0/vts/functional/Android.bp index 6b50fb5bf..d3f427628 100644 --- a/atrace/1.0/vts/functional/Android.bp +++ b/atrace/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalAtraceV1_0TargetTest.cpp"], static_libs: ["android.hardware.atrace@1.0"], + test_suites: ["general-tests"], } diff --git a/audio/core/2.0/vts/functional/Android.bp b/audio/core/2.0/vts/functional/Android.bp index d1ddaff94..cfa637b84 100644 --- a/audio/core/2.0/vts/functional/Android.bp +++ b/audio/core/2.0/vts/functional/Android.bp @@ -29,4 +29,5 @@ cc_test { "libicuuc_stubdata", "libxml2", ], + test_suites: ["general-tests"], } diff --git a/audio/core/4.0/vts/functional/Android.bp b/audio/core/4.0/vts/functional/Android.bp index e3b376ca8..7be888f08 100644 --- a/audio/core/4.0/vts/functional/Android.bp +++ b/audio/core/4.0/vts/functional/Android.bp @@ -35,4 +35,5 @@ cc_test { header_libs: [ "android.hardware.audio.common.util@all-versions", ], + test_suites: ["general-tests"], } diff --git a/audio/effect/2.0/vts/functional/Android.bp b/audio/effect/2.0/vts/functional/Android.bp index 51d2e11a1..1760e018d 100644 --- a/audio/effect/2.0/vts/functional/Android.bp +++ b/audio/effect/2.0/vts/functional/Android.bp @@ -32,4 +32,5 @@ cc_test { "libicuuc_stubdata", "libxml2", ], + test_suites: ["general-tests"], } diff --git a/audio/effect/4.0/vts/functional/Android.bp b/audio/effect/4.0/vts/functional/Android.bp index 96ded69d2..d6f8643ff 100644 --- a/audio/effect/4.0/vts/functional/Android.bp +++ b/audio/effect/4.0/vts/functional/Android.bp @@ -35,4 +35,5 @@ cc_test { header_libs: [ "android.hardware.audio.common.util@all-versions", ], + test_suites: ["general-tests"], } diff --git a/authsecret/1.0/vts/functional/Android.bp b/authsecret/1.0/vts/functional/Android.bp index de9f560ec..f2b3a8a53 100644 --- a/authsecret/1.0/vts/functional/Android.bp +++ b/authsecret/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalAuthSecretV1_0TargetTest.cpp"], static_libs: ["android.hardware.authsecret@1.0"], + test_suites: ["general-tests"], } diff --git a/automotive/audiocontrol/1.0/vts/functional/Android.bp b/automotive/audiocontrol/1.0/vts/functional/Android.bp index c6e0d8ea8..3cb6340ee 100644 --- a/automotive/audiocontrol/1.0/vts/functional/Android.bp +++ b/automotive/audiocontrol/1.0/vts/functional/Android.bp @@ -16,16 +16,14 @@ cc_test { name: "VtsHalAudioControlV1_0TargetTest", - srcs: [ "VtsHalAudioControlV1_0TargetTest.cpp", ], - defaults: [ "VtsHalTargetTestDefaults", ], - static_libs: [ "android.hardware.automotive.audiocontrol@1.0", ], + test_suites: ["general-tests"], } diff --git a/automotive/evs/1.0/vts/functional/Android.bp b/automotive/evs/1.0/vts/functional/Android.bp index 5d696fc4b..2ef33fdd1 100644 --- a/automotive/evs/1.0/vts/functional/Android.bp +++ b/automotive/evs/1.0/vts/functional/Android.bp @@ -16,21 +16,17 @@ cc_test { name: "VtsHalEvsV1_0TargetTest", - srcs: [ "VtsHalEvsV1_0TargetTest.cpp", "FrameHandler.cpp", "FormatConvert.cpp" ], - defaults: ["VtsHalTargetTestDefaults"], - shared_libs: [ "libui", ], - static_libs: ["android.hardware.automotive.evs@1.0"], - + test_suites: ["general-tests"], cflags: [ "-O0", "-g", diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp index 7802ef098..a11d45208 100644 --- a/automotive/vehicle/2.0/default/Android.bp +++ b/automotive/vehicle/2.0/default/Android.bp @@ -95,6 +95,7 @@ cc_test { "tests/VmsUtils_test.cpp", ], header_libs: ["libbase_headers"], + test_suites: ["general-tests"], } cc_binary { diff --git a/biometrics/fingerprint/2.1/vts/functional/Android.bp b/biometrics/fingerprint/2.1/vts/functional/Android.bp index bee3657ec..60228f2b5 100644 --- a/biometrics/fingerprint/2.1/vts/functional/Android.bp +++ b/biometrics/fingerprint/2.1/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBiometricsFingerprintV2_1TargetTest.cpp"], static_libs: ["android.hardware.biometrics.fingerprint@2.1"], + test_suites: ["general-tests"], } diff --git a/bluetooth/1.0/default/Android.bp b/bluetooth/1.0/default/Android.bp index 48bbadf8a..f4b1e7b48 100644 --- a/bluetooth/1.0/default/Android.bp +++ b/bluetooth/1.0/default/Android.bp @@ -94,6 +94,7 @@ cc_test { "android.hardware.bluetooth-hci", "libgmock", ], + test_suites: ["general-tests"], } cc_test_host { diff --git a/bluetooth/1.0/vts/functional/Android.bp b/bluetooth/1.0/vts/functional/Android.bp index 2e60588c3..54039e581 100644 --- a/bluetooth/1.0/vts/functional/Android.bp +++ b/bluetooth/1.0/vts/functional/Android.bp @@ -22,4 +22,5 @@ cc_test { "android.hardware.bluetooth@1.0", "libbluetooth-types", ], + test_suites: ["general-tests"], } diff --git a/bluetooth/a2dp/1.0/vts/functional/Android.bp b/bluetooth/a2dp/1.0/vts/functional/Android.bp index f1ffc4592..e50e16730 100644 --- a/bluetooth/a2dp/1.0/vts/functional/Android.bp +++ b/bluetooth/a2dp/1.0/vts/functional/Android.bp @@ -23,4 +23,5 @@ cc_test { "android.hardware.bluetooth.a2dp@1.0", "libbluetooth-types", ], + test_suites: ["general-tests"], } diff --git a/boot/1.0/vts/functional/Android.bp b/boot/1.0/vts/functional/Android.bp index 2ef89f3aa..5d1a9cbeb 100644 --- a/boot/1.0/vts/functional/Android.bp +++ b/boot/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalBootV1_0TargetTest.cpp"], static_libs: ["android.hardware.boot@1.0"], + test_suites: ["general-tests"], } diff --git a/broadcastradio/1.0/vts/functional/Android.bp b/broadcastradio/1.0/vts/functional/Android.bp index 7040a0177..9ba9fbe20 100644 --- a/broadcastradio/1.0/vts/functional/Android.bp +++ b/broadcastradio/1.0/vts/functional/Android.bp @@ -22,4 +22,5 @@ cc_test { "android.hardware.broadcastradio@1.0", "android.hardware.broadcastradio@vts-utils-lib", ], + test_suites: ["general-tests"], } diff --git a/broadcastradio/1.1/vts/functional/Android.bp b/broadcastradio/1.1/vts/functional/Android.bp index 9240cf058..0a02a694c 100644 --- a/broadcastradio/1.1/vts/functional/Android.bp +++ b/broadcastradio/1.1/vts/functional/Android.bp @@ -25,4 +25,5 @@ cc_test { "android.hardware.broadcastradio@vts-utils-lib", "libgmock", ], + test_suites: ["general-tests"], } diff --git a/broadcastradio/2.0/vts/functional/Android.bp b/broadcastradio/2.0/vts/functional/Android.bp index 6940bca49..3e18a54cc 100644 --- a/broadcastradio/2.0/vts/functional/Android.bp +++ b/broadcastradio/2.0/vts/functional/Android.bp @@ -28,4 +28,5 @@ cc_test { "android.hardware.broadcastradio@vts-utils-lib", "libgmock", ], + test_suites: ["general-tests"], } diff --git a/broadcastradio/common/tests/Android.bp b/broadcastradio/common/tests/Android.bp index 3ba31db11..ef8733c29 100644 --- a/broadcastradio/common/tests/Android.bp +++ b/broadcastradio/common/tests/Android.bp @@ -36,6 +36,7 @@ cc_test { "android.hardware.broadcastradio@1.1", "android.hardware.broadcastradio@2.0", ], + test_suites: ["general-tests"], } cc_test { @@ -59,6 +60,7 @@ cc_test { shared_libs: [ "android.hardware.broadcastradio@2.0", ], + test_suites: ["general-tests"], } cc_test { @@ -73,4 +75,5 @@ cc_test { "WorkerThread_test.cpp", ], static_libs: ["android.hardware.broadcastradio@common-utils-lib"], + test_suites: ["general-tests"], } diff --git a/camera/provider/2.4/vts/functional/Android.bp b/camera/provider/2.4/vts/functional/Android.bp index eb8d43e5b..2db1584c4 100644 --- a/camera/provider/2.4/vts/functional/Android.bp +++ b/camera/provider/2.4/vts/functional/Android.bp @@ -46,4 +46,5 @@ cc_test { "libgrallocusage", "libhidlmemory", ], + test_suites: ["general-tests"], } diff --git a/cas/1.0/vts/functional/Android.bp b/cas/1.0/vts/functional/Android.bp index 0db9bb00c..622baa598 100644 --- a/cas/1.0/vts/functional/Android.bp +++ b/cas/1.0/vts/functional/Android.bp @@ -29,5 +29,6 @@ cc_test { shared_libs: [ "libbinder", ], + test_suites: ["general-tests"], } diff --git a/configstore/1.0/vts/functional/Android.bp b/configstore/1.0/vts/functional/Android.bp index 1b8a59139..008b59d00 100644 --- a/configstore/1.0/vts/functional/Android.bp +++ b/configstore/1.0/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalConfigstoreV1_0TargetTest.cpp"], static_libs: ["android.hardware.configstore@1.0"], + test_suites: ["general-tests"], } diff --git a/confirmationui/1.0/vts/functional/Android.bp b/confirmationui/1.0/vts/functional/Android.bp index 823e035af..d19d7021a 100644 --- a/confirmationui/1.0/vts/functional/Android.bp +++ b/confirmationui/1.0/vts/functional/Android.bp @@ -27,4 +27,5 @@ cc_test { "libcn-cbor", "android.hardware.confirmationui-support-lib", ], + test_suites: ["general-tests"], } diff --git a/confirmationui/support/Android.bp b/confirmationui/support/Android.bp index 62156b341..e215baa14 100644 --- a/confirmationui/support/Android.bp +++ b/confirmationui/support/Android.bp @@ -46,6 +46,7 @@ cc_test { "android.hardware.keymaster@4.0", "libhidlbase", ], + test_suites: ["general-tests"], clang: true, cflags: [ "-O0" ], } diff --git a/contexthub/1.0/vts/functional/Android.bp b/contexthub/1.0/vts/functional/Android.bp index 7c6e8c73b..aef03409a 100644 --- a/contexthub/1.0/vts/functional/Android.bp +++ b/contexthub/1.0/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalContexthubV1_0TargetTest.cpp"], static_libs: ["android.hardware.contexthub@1.0"], + test_suites: ["general-tests"], } diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index 57678fb46..d6ebfdddf 100644 --- a/drm/1.0/vts/functional/Android.bp +++ b/drm/1.0/vts/functional/Android.bp @@ -32,4 +32,5 @@ cc_test { "libssl", "libcrypto", ], + test_suites: ["general-tests"], } diff --git a/drm/1.1/vts/functional/Android.bp b/drm/1.1/vts/functional/Android.bp index 782f2833c..1090b6900 100644 --- a/drm/1.1/vts/functional/Android.bp +++ b/drm/1.1/vts/functional/Android.bp @@ -31,4 +31,5 @@ cc_test { "libssl", "libcrypto", ], + test_suites: ["general-tests"], } diff --git a/dumpstate/1.0/vts/functional/Android.bp b/dumpstate/1.0/vts/functional/Android.bp index 1ab530fec..fc64d056b 100644 --- a/dumpstate/1.0/vts/functional/Android.bp +++ b/dumpstate/1.0/vts/functional/Android.bp @@ -18,4 +18,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalDumpstateV1_0TargetTest.cpp"], static_libs: ["android.hardware.dumpstate@1.0"], + test_suites: ["general-tests"], } diff --git a/gatekeeper/1.0/vts/functional/Android.bp b/gatekeeper/1.0/vts/functional/Android.bp index aa1da7bb4..f55e5d2c0 100644 --- a/gatekeeper/1.0/vts/functional/Android.bp +++ b/gatekeeper/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGatekeeperV1_0TargetTest.cpp"], static_libs: ["android.hardware.gatekeeper@1.0"], + test_suites: ["general-tests"], } diff --git a/gnss/1.0/vts/functional/Android.bp b/gnss/1.0/vts/functional/Android.bp index d7713dbc2..505cb41a2 100644 --- a/gnss/1.0/vts/functional/Android.bp +++ b/gnss/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalGnssV1_0TargetTest.cpp"], static_libs: ["android.hardware.gnss@1.0"], + test_suites: ["general-tests"], } diff --git a/gnss/1.1/vts/functional/Android.bp b/gnss/1.1/vts/functional/Android.bp index 67ef4868c..9892eca12 100644 --- a/gnss/1.1/vts/functional/Android.bp +++ b/gnss/1.1/vts/functional/Android.bp @@ -26,4 +26,5 @@ cc_test { "android.hardware.gnss@1.0", "android.hardware.gnss@1.1", ], + test_suites: ["general-tests"], } diff --git a/graphics/composer/2.1/vts/functional/Android.bp b/graphics/composer/2.1/vts/functional/Android.bp index 8e346df9c..c98cc0deb 100644 --- a/graphics/composer/2.1/vts/functional/Android.bp +++ b/graphics/composer/2.1/vts/functional/Android.bp @@ -34,4 +34,5 @@ cc_test { header_libs: [ "android.hardware.graphics.composer@2.1-command-buffer", ], + test_suites: ["general-tests"], } diff --git a/graphics/composer/2.2/vts/functional/Android.bp b/graphics/composer/2.2/vts/functional/Android.bp index acc924595..b62f3021b 100644 --- a/graphics/composer/2.2/vts/functional/Android.bp +++ b/graphics/composer/2.2/vts/functional/Android.bp @@ -44,4 +44,5 @@ cc_test { "android.hardware.graphics.composer@2.1-command-buffer", "android.hardware.graphics.composer@2.2-command-buffer", ], + test_suites: ["general-tests"], } diff --git a/graphics/mapper/2.0/vts/functional/Android.bp b/graphics/mapper/2.0/vts/functional/Android.bp index 969317a8f..853c2a3b0 100644 --- a/graphics/mapper/2.0/vts/functional/Android.bp +++ b/graphics/mapper/2.0/vts/functional/Android.bp @@ -24,4 +24,5 @@ cc_test { "android.hardware.graphics.mapper@2.0", "android.hardware.graphics.mapper@2.0-vts", ], + test_suites: ["general-tests"], } diff --git a/graphics/mapper/2.1/vts/functional/Android.bp b/graphics/mapper/2.1/vts/functional/Android.bp index ac67af853..afd8e7f9d 100644 --- a/graphics/mapper/2.1/vts/functional/Android.bp +++ b/graphics/mapper/2.1/vts/functional/Android.bp @@ -26,4 +26,5 @@ cc_test { "android.hardware.graphics.mapper@2.0-vts", "android.hardware.graphics.mapper@2.1-vts", ], + test_suites: ["general-tests"], } diff --git a/health/1.0/vts/functional/Android.bp b/health/1.0/vts/functional/Android.bp index 8742651ba..c14dceeb0 100644 --- a/health/1.0/vts/functional/Android.bp +++ b/health/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalHealthV1_0TargetTest.cpp"], static_libs: ["android.hardware.health@1.0"], + test_suites: ["general-tests"], } diff --git a/health/2.0/vts/functional/Android.bp b/health/2.0/vts/functional/Android.bp index 4ad01b98d..3544e5f0c 100644 --- a/health/2.0/vts/functional/Android.bp +++ b/health/2.0/vts/functional/Android.bp @@ -22,4 +22,5 @@ cc_test { "android.hardware.health@1.0", "android.hardware.health@2.0", ], + test_suites: ["general-tests"], } diff --git a/health/storage/1.0/vts/functional/Android.bp b/health/storage/1.0/vts/functional/Android.bp index 63591cf12..250a7dcb8 100644 --- a/health/storage/1.0/vts/functional/Android.bp +++ b/health/storage/1.0/vts/functional/Android.bp @@ -22,5 +22,6 @@ cc_test { shared_libs: [ "libhidltransport" ], + test_suites: ["general-tests"], } diff --git a/ir/1.0/vts/functional/Android.bp b/ir/1.0/vts/functional/Android.bp index 2a86f8e5d..f5c9d6105 100644 --- a/ir/1.0/vts/functional/Android.bp +++ b/ir/1.0/vts/functional/Android.bp @@ -21,4 +21,5 @@ cc_test { static_libs: [ "android.hardware.ir@1.0", ], + test_suites: ["general-tests"], } diff --git a/keymaster/3.0/vts/functional/Android.bp b/keymaster/3.0/vts/functional/Android.bp index 7d96704f2..b0371c79e 100644 --- a/keymaster/3.0/vts/functional/Android.bp +++ b/keymaster/3.0/vts/functional/Android.bp @@ -29,4 +29,5 @@ cc_test { "libcrypto", "libsoftkeymasterdevice", ], + test_suites: ["general-tests"], } diff --git a/keymaster/4.0/vts/functional/Android.bp b/keymaster/4.0/vts/functional/Android.bp index d74a16fb0..333e408b2 100644 --- a/keymaster/4.0/vts/functional/Android.bp +++ b/keymaster/4.0/vts/functional/Android.bp @@ -29,4 +29,5 @@ cc_test { "libkeymaster4support", "libsoftkeymasterdevice", ], + test_suites: ["general-tests"], } diff --git a/light/2.0/vts/functional/Android.bp b/light/2.0/vts/functional/Android.bp index e0ec4cf1c..9f03d271f 100644 --- a/light/2.0/vts/functional/Android.bp +++ b/light/2.0/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalLightV2_0TargetTest.cpp"], static_libs: ["android.hardware.light@2.0"], + test_suites: ["general-tests"], } diff --git a/media/omx/1.0/vts/functional/audio/Android.bp b/media/omx/1.0/vts/functional/audio/Android.bp index f517fa1d9..7418bb422 100644 --- a/media/omx/1.0/vts/functional/audio/Android.bp +++ b/media/omx/1.0/vts/functional/audio/Android.bp @@ -21,6 +21,7 @@ cc_test { "VtsHalMediaOmxV1_0TargetAudioEncTest.cpp", "media_audio_hidl_test_common.cpp" ], + test_suites: ["general-tests"], } cc_test { @@ -30,6 +31,7 @@ cc_test { "VtsHalMediaOmxV1_0TargetAudioDecTest.cpp", "media_audio_hidl_test_common.cpp" ], + test_suites: ["general-tests"], } diff --git a/media/omx/1.0/vts/functional/component/Android.bp b/media/omx/1.0/vts/functional/component/Android.bp index f76b6e94f..970eabe6f 100644 --- a/media/omx/1.0/vts/functional/component/Android.bp +++ b/media/omx/1.0/vts/functional/component/Android.bp @@ -18,5 +18,6 @@ cc_test { name: "VtsHalMediaOmxV1_0TargetComponentTest", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: ["VtsHalMediaOmxV1_0TargetComponentTest.cpp"], + test_suites: ["general-tests"], } diff --git a/media/omx/1.0/vts/functional/master/Android.bp b/media/omx/1.0/vts/functional/master/Android.bp index 4a45e6923..cf3f15d53 100644 --- a/media/omx/1.0/vts/functional/master/Android.bp +++ b/media/omx/1.0/vts/functional/master/Android.bp @@ -18,5 +18,6 @@ cc_test { name: "VtsHalMediaOmxV1_0TargetMasterTest", defaults: ["VtsHalMediaOmxV1_0Defaults"], srcs: ["VtsHalMediaOmxV1_0TargetMasterTest.cpp"], + test_suites: ["general-tests"], } diff --git a/media/omx/1.0/vts/functional/video/Android.bp b/media/omx/1.0/vts/functional/video/Android.bp index f0da2b39d..c7e042447 100644 --- a/media/omx/1.0/vts/functional/video/Android.bp +++ b/media/omx/1.0/vts/functional/video/Android.bp @@ -21,6 +21,7 @@ cc_test { "VtsHalMediaOmxV1_0TargetVideoDecTest.cpp", "media_video_hidl_test_common.cpp" ], + test_suites: ["general-tests"], } cc_test { @@ -33,4 +34,5 @@ cc_test { static_libs: [ "libnativewindow", ], + test_suites: ["general-tests"], } diff --git a/memtrack/1.0/vts/functional/Android.bp b/memtrack/1.0/vts/functional/Android.bp index 2d833e762..d682e0b80 100644 --- a/memtrack/1.0/vts/functional/Android.bp +++ b/memtrack/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalMemtrackV1_0TargetTest.cpp"], static_libs: ["android.hardware.memtrack@1.0"], + test_suites: ["general-tests"], } diff --git a/neuralnetworks/1.0/vts/functional/Android.bp b/neuralnetworks/1.0/vts/functional/Android.bp index 234527a74..dd6f9341d 100644 --- a/neuralnetworks/1.0/vts/functional/Android.bp +++ b/neuralnetworks/1.0/vts/functional/Android.bp @@ -81,4 +81,5 @@ cc_test { "BasicTests.cpp", "GeneratedTests.cpp", ], + test_suites: ["general-tests"], } diff --git a/neuralnetworks/1.1/vts/functional/Android.bp b/neuralnetworks/1.1/vts/functional/Android.bp index 07c9b6ebb..3f0c2561b 100644 --- a/neuralnetworks/1.1/vts/functional/Android.bp +++ b/neuralnetworks/1.1/vts/functional/Android.bp @@ -21,6 +21,7 @@ cc_test { srcs: [ "GeneratedTestsV1_0.cpp", ], + test_suites: ["general-tests"], } // Tests for V1_1 models. @@ -31,4 +32,5 @@ cc_test { "BasicTests.cpp", "GeneratedTests.cpp", ], + test_suites: ["general-tests"], } diff --git a/neuralnetworks/1.2/vts/functional/Android.bp b/neuralnetworks/1.2/vts/functional/Android.bp index 085d5db22..5b119ee83 100644 --- a/neuralnetworks/1.2/vts/functional/Android.bp +++ b/neuralnetworks/1.2/vts/functional/Android.bp @@ -20,7 +20,8 @@ cc_test { defaults: ["VtsHalNeuralNetworksTargetTestDefaults"], srcs: [ "GeneratedTestsV1_0.cpp", - ] + ], + test_suites: ["general-tests"], } // Tests for V1_1 models using the V1_2 HAL. @@ -30,6 +31,7 @@ cc_test { srcs: [ "GeneratedTestsV1_1.cpp", ], + test_suites: ["general-tests"], } // Tests for V1_2 models. @@ -40,4 +42,5 @@ cc_test { "BasicTests.cpp", "GeneratedTests.cpp", ], + test_suites: ["general-tests"], } diff --git a/nfc/1.0/vts/functional/Android.bp b/nfc/1.0/vts/functional/Android.bp index 3861bd469..c2e365e53 100644 --- a/nfc/1.0/vts/functional/Android.bp +++ b/nfc/1.0/vts/functional/Android.bp @@ -21,4 +21,5 @@ cc_test { static_libs: [ "android.hardware.nfc@1.0", ], + test_suites: ["general-tests"], } diff --git a/nfc/1.1/vts/functional/Android.bp b/nfc/1.1/vts/functional/Android.bp index 0ce531f6a..6698c5a4e 100644 --- a/nfc/1.1/vts/functional/Android.bp +++ b/nfc/1.1/vts/functional/Android.bp @@ -22,4 +22,5 @@ cc_test { "android.hardware.nfc@1.0", "android.hardware.nfc@1.1", ], + test_suites: ["general-tests"], } diff --git a/oemlock/1.0/vts/functional/Android.bp b/oemlock/1.0/vts/functional/Android.bp index 20737a180..28d6bf6b1 100644 --- a/oemlock/1.0/vts/functional/Android.bp +++ b/oemlock/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalOemLockV1_0TargetTest.cpp"], static_libs: ["android.hardware.oemlock@1.0"], + test_suites: ["general-tests"], } diff --git a/power/1.0/vts/functional/Android.bp b/power/1.0/vts/functional/Android.bp index 45f74fc79..a716f027b 100644 --- a/power/1.0/vts/functional/Android.bp +++ b/power/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalPowerV1_0TargetTest.cpp"], static_libs: ["android.hardware.power@1.0"], + test_suites: ["general-tests"], } diff --git a/power/1.1/vts/functional/Android.bp b/power/1.1/vts/functional/Android.bp index 604cd36ee..de7598453 100644 --- a/power/1.1/vts/functional/Android.bp +++ b/power/1.1/vts/functional/Android.bp @@ -22,4 +22,5 @@ cc_test { "android.hardware.power@1.0", "android.hardware.power@1.1", ], + test_suites: ["general-tests"], } diff --git a/power/1.2/vts/functional/Android.bp b/power/1.2/vts/functional/Android.bp index d615e85a7..f424bfa1f 100644 --- a/power/1.2/vts/functional/Android.bp +++ b/power/1.2/vts/functional/Android.bp @@ -23,4 +23,5 @@ cc_test { "android.hardware.power@1.1", "android.hardware.power@1.2", ], + test_suites: ["general-tests"], } diff --git a/power/1.3/vts/functional/Android.bp b/power/1.3/vts/functional/Android.bp index 34cdb6079..06f6e7ae6 100644 --- a/power/1.3/vts/functional/Android.bp +++ b/power/1.3/vts/functional/Android.bp @@ -24,4 +24,5 @@ cc_test { "android.hardware.power@1.2", "android.hardware.power@1.3", ], + test_suites: ["general-tests"], } diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index afbb1c4b1..9dec2f28a 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -33,6 +33,7 @@ cc_test { static_libs: [ "android.hardware.radio@1.0", ], + test_suites: ["general-tests"], } cc_test { @@ -46,6 +47,7 @@ cc_test { static_libs: [ "android.hardware.radio@1.0", ], + test_suites: ["general-tests"], } cc_library_static { diff --git a/radio/1.1/vts/functional/Android.bp b/radio/1.1/vts/functional/Android.bp index e7195ee7d..5695c6bb8 100644 --- a/radio/1.1/vts/functional/Android.bp +++ b/radio/1.1/vts/functional/Android.bp @@ -30,4 +30,5 @@ cc_test { header_libs: [ "radio.util.header@1.0", ], + test_suites: ["general-tests"], } diff --git a/radio/1.2/vts/functional/Android.bp b/radio/1.2/vts/functional/Android.bp index a4e8c02c6..6782f143d 100644 --- a/radio/1.2/vts/functional/Android.bp +++ b/radio/1.2/vts/functional/Android.bp @@ -31,4 +31,5 @@ cc_test { "android.hardware.radio@1.0", ], header_libs: ["radio.util.header@1.0"], + test_suites: ["general-tests"], } diff --git a/radio/config/1.0/vts/functional/Android.bp b/radio/config/1.0/vts/functional/Android.bp index aa8266ea3..9c9603099 100644 --- a/radio/config/1.0/vts/functional/Android.bp +++ b/radio/config/1.0/vts/functional/Android.bp @@ -29,4 +29,5 @@ cc_test { "android.hardware.radio.config@1.0", ], header_libs: ["radio.util.header@1.0"], + test_suites: ["general-tests"], } diff --git a/renderscript/1.0/vts/functional/Android.bp b/renderscript/1.0/vts/functional/Android.bp index bf011e6c1..87e62f17c 100644 --- a/renderscript/1.0/vts/functional/Android.bp +++ b/renderscript/1.0/vts/functional/Android.bp @@ -28,4 +28,5 @@ cc_test { "android.hardware.renderscript@1.0", "libnativewindow", ], + test_suites: ["general-tests"], } diff --git a/secure_element/1.0/vts/functional/Android.bp b/secure_element/1.0/vts/functional/Android.bp index 752df9e9b..2b2b73e1d 100644 --- a/secure_element/1.0/vts/functional/Android.bp +++ b/secure_element/1.0/vts/functional/Android.bp @@ -21,4 +21,5 @@ cc_test { static_libs: [ "android.hardware.secure_element@1.0", ], + test_suites: ["general-tests"], } diff --git a/sensors/1.0/vts/functional/Android.bp b/sensors/1.0/vts/functional/Android.bp index 6563e3c15..d4c5f321d 100644 --- a/sensors/1.0/vts/functional/Android.bp +++ b/sensors/1.0/vts/functional/Android.bp @@ -27,5 +27,6 @@ cc_test { "android.hardware.sensors@1.0", "VtsHalSensorsTargetTestUtils", ], + test_suites: ["general-tests"], } diff --git a/soundtrigger/2.0/vts/functional/Android.bp b/soundtrigger/2.0/vts/functional/Android.bp index be6b3a802..f6207c4b2 100644 --- a/soundtrigger/2.0/vts/functional/Android.bp +++ b/soundtrigger/2.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalSoundtriggerV2_0TargetTest.cpp"], static_libs: ["android.hardware.soundtrigger@2.0"], + test_suites: ["general-tests"], } diff --git a/soundtrigger/2.1/vts/functional/Android.bp b/soundtrigger/2.1/vts/functional/Android.bp index 925a17ce1..f1eb35d32 100644 --- a/soundtrigger/2.1/vts/functional/Android.bp +++ b/soundtrigger/2.1/vts/functional/Android.bp @@ -25,4 +25,5 @@ cc_test { "android.hardware.soundtrigger@2.1", "libhidlmemory" ], + test_suites: ["general-tests"], } diff --git a/tests/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp index 6bbca2459..6c8be6cac 100644 --- a/tests/msgq/1.0/default/Android.bp +++ b/tests/msgq/1.0/default/Android.bp @@ -54,6 +54,7 @@ cc_test { "libutils", "android.hardware.tests.msgq@1.0" ], + test_suites: ["general-tests"], } cc_test { @@ -80,4 +81,5 @@ cc_test { // libs should be used on device. static_libs: ["android.hardware.tests.msgq@1.0"], whole_static_libs: ["android.hardware.tests.msgq@1.0-impl"], + test_suites: ["general-tests"], } diff --git a/tetheroffload/config/1.0/vts/functional/Android.bp b/tetheroffload/config/1.0/vts/functional/Android.bp index dc95eaa28..52b981039 100644 --- a/tetheroffload/config/1.0/vts/functional/Android.bp +++ b/tetheroffload/config/1.0/vts/functional/Android.bp @@ -17,4 +17,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTetheroffloadConfigV1_0TargetTest.cpp"], static_libs: ["android.hardware.tetheroffload.config@1.0"], + test_suites: ["general-tests"], } diff --git a/tetheroffload/control/1.0/vts/functional/Android.bp b/tetheroffload/control/1.0/vts/functional/Android.bp index c6216a2f9..e8e1414da 100644 --- a/tetheroffload/control/1.0/vts/functional/Android.bp +++ b/tetheroffload/control/1.0/vts/functional/Android.bp @@ -20,4 +20,5 @@ cc_test { "android.hardware.tetheroffload.config@1.0", "android.hardware.tetheroffload.control@1.0", ], + test_suites: ["general-tests"], } diff --git a/thermal/1.0/vts/functional/Android.bp b/thermal/1.0/vts/functional/Android.bp index f661f1e1d..6bda55833 100644 --- a/thermal/1.0/vts/functional/Android.bp +++ b/thermal/1.0/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalThermalV1_0TargetTest.cpp"], static_libs: ["android.hardware.thermal@1.0"], + test_suites: ["general-tests"], } diff --git a/thermal/1.1/vts/functional/Android.bp b/thermal/1.1/vts/functional/Android.bp index f5f01faf2..9a16c30fb 100644 --- a/thermal/1.1/vts/functional/Android.bp +++ b/thermal/1.1/vts/functional/Android.bp @@ -22,5 +22,6 @@ cc_test { "android.hardware.thermal@1.0", "android.hardware.thermal@1.1", ], + test_suites: ["general-tests"], } diff --git a/tv/input/1.0/vts/functional/Android.bp b/tv/input/1.0/vts/functional/Android.bp index 978830c41..29181b0c8 100644 --- a/tv/input/1.0/vts/functional/Android.bp +++ b/tv/input/1.0/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalTvInputV1_0TargetTest.cpp"], static_libs: ["android.hardware.tv.input@1.0"], + test_suites: ["general-tests"], } diff --git a/usb/1.0/vts/functional/Android.bp b/usb/1.0/vts/functional/Android.bp index 96d3c0efa..683ee17b9 100644 --- a/usb/1.0/vts/functional/Android.bp +++ b/usb/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalUsbV1_0TargetTest.cpp"], static_libs: ["android.hardware.usb@1.0"], + test_suites: ["general-tests"], } diff --git a/usb/1.1/vts/functional/Android.bp b/usb/1.1/vts/functional/Android.bp index 4bb320369..1f0972fd9 100644 --- a/usb/1.1/vts/functional/Android.bp +++ b/usb/1.1/vts/functional/Android.bp @@ -22,5 +22,6 @@ cc_test { "android.hardware.usb@1.0", "android.hardware.usb@1.1", ], + test_suites: ["general-tests"], } diff --git a/vibrator/1.0/vts/functional/Android.bp b/vibrator/1.0/vts/functional/Android.bp index 016d627bf..391d3d49f 100644 --- a/vibrator/1.0/vts/functional/Android.bp +++ b/vibrator/1.0/vts/functional/Android.bp @@ -19,5 +19,6 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVibratorV1_0TargetTest.cpp"], static_libs: ["android.hardware.vibrator@1.0"], + test_suites: ["general-tests"], } diff --git a/vibrator/1.1/vts/functional/Android.bp b/vibrator/1.1/vts/functional/Android.bp index 4f6454b6c..c65ff4157 100644 --- a/vibrator/1.1/vts/functional/Android.bp +++ b/vibrator/1.1/vts/functional/Android.bp @@ -22,5 +22,6 @@ cc_test { "android.hardware.vibrator@1.0", "android.hardware.vibrator@1.1", ], + test_suites: ["general-tests"], } diff --git a/vibrator/1.2/vts/functional/Android.bp b/vibrator/1.2/vts/functional/Android.bp index 3a4e2efdb..1e3ec97e5 100644 --- a/vibrator/1.2/vts/functional/Android.bp +++ b/vibrator/1.2/vts/functional/Android.bp @@ -23,5 +23,6 @@ cc_test { "android.hardware.vibrator@1.1", "android.hardware.vibrator@1.2", ], + test_suites: ["general-tests"], } diff --git a/vr/1.0/vts/functional/Android.bp b/vr/1.0/vts/functional/Android.bp index 40291377d..958cce768 100644 --- a/vr/1.0/vts/functional/Android.bp +++ b/vr/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalVrV1_0TargetTest.cpp"], static_libs: ["android.hardware.vr@1.0"], + test_suites: ["general-tests"], } diff --git a/weaver/1.0/vts/functional/Android.bp b/weaver/1.0/vts/functional/Android.bp index 0089d8905..9fdbb1843 100644 --- a/weaver/1.0/vts/functional/Android.bp +++ b/weaver/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWeaverV1_0TargetTest.cpp"], static_libs: ["android.hardware.weaver@1.0"], + test_suites: ["general-tests"], } diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index d0dd9151b..3189db42d 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -48,6 +48,7 @@ cc_test { "android.hardware.wifi@1.2", "android.hardware.wifi@1.3", ], + test_suites: ["general-tests"], } cc_test { @@ -61,4 +62,5 @@ cc_test { "VtsHalWifiV1_0TargetTestUtil", "android.hardware.wifi@1.0", ], + test_suites: ["general-tests"], } diff --git a/wifi/1.1/vts/functional/Android.bp b/wifi/1.1/vts/functional/Android.bp index 1b0c12d68..78d7a854b 100644 --- a/wifi/1.1/vts/functional/Android.bp +++ b/wifi/1.1/vts/functional/Android.bp @@ -25,4 +25,5 @@ cc_test { "android.hardware.wifi@1.0", "android.hardware.wifi@1.1", ], + test_suites: ["general-tests"], } diff --git a/wifi/1.2/vts/functional/Android.bp b/wifi/1.2/vts/functional/Android.bp index c5a6e8417..a969f655a 100644 --- a/wifi/1.2/vts/functional/Android.bp +++ b/wifi/1.2/vts/functional/Android.bp @@ -28,6 +28,7 @@ cc_test { "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", ], + test_suites: ["general-tests"], } cc_test { @@ -43,4 +44,5 @@ cc_test { "android.hardware.wifi@1.1", "android.hardware.wifi@1.2", ], + test_suites: ["general-tests"], } diff --git a/wifi/hostapd/1.0/vts/functional/Android.bp b/wifi/hostapd/1.0/vts/functional/Android.bp index 7a920b448..79c518388 100644 --- a/wifi/hostapd/1.0/vts/functional/Android.bp +++ b/wifi/hostapd/1.0/vts/functional/Android.bp @@ -49,4 +49,5 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], + test_suites: ["general-tests"], } diff --git a/wifi/offload/1.0/vts/functional/Android.bp b/wifi/offload/1.0/vts/functional/Android.bp index 140e45e2d..de15aa74e 100644 --- a/wifi/offload/1.0/vts/functional/Android.bp +++ b/wifi/offload/1.0/vts/functional/Android.bp @@ -19,4 +19,5 @@ cc_test { defaults: ["VtsHalTargetTestDefaults"], srcs: ["VtsHalWifiOffloadV1_0TargetTest.cpp"], static_libs: ["android.hardware.wifi.offload@1.0"], + test_suites: ["general-tests"], } diff --git a/wifi/supplicant/1.0/vts/functional/Android.bp b/wifi/supplicant/1.0/vts/functional/Android.bp index 7a6857cf4..bdccac191 100644 --- a/wifi/supplicant/1.0/vts/functional/Android.bp +++ b/wifi/supplicant/1.0/vts/functional/Android.bp @@ -53,6 +53,7 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], + test_suites: ["general-tests"], } cc_test { diff --git a/wifi/supplicant/1.1/vts/functional/Android.bp b/wifi/supplicant/1.1/vts/functional/Android.bp index 3e65453c2..353ae4b84 100644 --- a/wifi/supplicant/1.1/vts/functional/Android.bp +++ b/wifi/supplicant/1.1/vts/functional/Android.bp @@ -56,4 +56,5 @@ cc_test { "libwifi-system", "libwifi-system-iface", ], + test_suites: ["general-tests"], } |