diff --git a/audio/core/all-versions/vts/functional/Android.bp b/audio/core/all-versions/vts/functional/Android.bp index 73af7f471e..d3545c8d2c 100644 --- a/audio/core/all-versions/vts/functional/Android.bp +++ b/audio/core/all-versions/vts/functional/Android.bp @@ -47,7 +47,7 @@ cc_test { "-DMAJOR_VERSION=2", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } cc_test { @@ -64,7 +64,7 @@ cc_test { "-DMAJOR_VERSION=4", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } cc_test { @@ -81,7 +81,7 @@ cc_test { "-DMAJOR_VERSION=5", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], } cc_test { @@ -98,5 +98,15 @@ cc_test { "-DMAJOR_VERSION=6", "-DMINOR_VERSION=0", "-include common/all-versions/VersionMacro.h", - ] + ], + // Use test_config for vts-core suite. + // TODO(b/146104851): Add auto-gen rules and remove it. + test_config: "VtsHalAudioV6_0TargetTest.xml", + data: [ + ":audio_policy_configuration_V6_0", + ], + test_suites: [ + "general-tests", + "vts-core", + ], } diff --git a/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml b/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml new file mode 100644 index 0000000000..05edc0dc7d --- /dev/null +++ b/audio/core/all-versions/vts/functional/VtsHalAudioV6_0TargetTest.xml @@ -0,0 +1,40 @@ + + + +