From 1283685b4f662371e5f8a19b1440c3a96d124bb7 Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Wed, 13 Dec 2023 01:07:52 +0000 Subject: [PATCH 1/2] Update VTS header includes Bug: 273373363 Test: atest --test-mapping hardware/interfaces/audio/aidl/vts Change-Id: I2ad63f91b013db1ce2d3891216f1bd74606139c8 --- audio/aidl/vts/EffectFactoryHelper.h | 1 + audio/aidl/vts/VtsHalAECTargetTest.cpp | 1 - audio/aidl/vts/VtsHalAGC1TargetTest.cpp | 1 - audio/aidl/vts/VtsHalAGC2TargetTest.cpp | 1 - audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp | 2 -- audio/aidl/vts/VtsHalBassBoostTargetTest.cpp | 3 --- audio/aidl/vts/VtsHalDownmixTargetTest.cpp | 1 - audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp | 1 - audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp | 1 - audio/aidl/vts/VtsHalEqualizerTargetTest.cpp | 5 ----- audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp | 1 - audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp | 1 - audio/aidl/vts/VtsHalNSTargetTest.cpp | 1 - audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp | 1 - audio/aidl/vts/VtsHalSpatializerTargetTest.cpp | 2 -- audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp | 1 - audio/aidl/vts/VtsHalVisualizerTargetTest.cpp | 1 - audio/aidl/vts/VtsHalVolumeTargetTest.cpp | 1 - 18 files changed, 1 insertion(+), 25 deletions(-) diff --git a/audio/aidl/vts/EffectFactoryHelper.h b/audio/aidl/vts/EffectFactoryHelper.h index a2499fd3c1..ca36655655 100644 --- a/audio/aidl/vts/EffectFactoryHelper.h +++ b/audio/aidl/vts/EffectFactoryHelper.h @@ -21,6 +21,7 @@ #include #include +#include #include #include "TestUtils.h" diff --git a/audio/aidl/vts/VtsHalAECTargetTest.cpp b/audio/aidl/vts/VtsHalAECTargetTest.cpp index 39168b1bf1..f972b84c7b 100644 --- a/audio/aidl/vts/VtsHalAECTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAECTargetTest.cpp @@ -18,7 +18,6 @@ #include #include -#include #define LOG_TAG "VtsHalAECParamTest" #include diff --git a/audio/aidl/vts/VtsHalAGC1TargetTest.cpp b/audio/aidl/vts/VtsHalAGC1TargetTest.cpp index 6066025efd..75da5891e0 100644 --- a/audio/aidl/vts/VtsHalAGC1TargetTest.cpp +++ b/audio/aidl/vts/VtsHalAGC1TargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalAGC1ParamTest" #include diff --git a/audio/aidl/vts/VtsHalAGC2TargetTest.cpp b/audio/aidl/vts/VtsHalAGC2TargetTest.cpp index 8793e4c862..5f57a88c05 100644 --- a/audio/aidl/vts/VtsHalAGC2TargetTest.cpp +++ b/audio/aidl/vts/VtsHalAGC2TargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalAGC2ParamTest" #include #include diff --git a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp index aaf9ad4e74..418fedbcb3 100644 --- a/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp +++ b/audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp @@ -16,13 +16,11 @@ #define LOG_TAG "VtsHalAudioEffectTargetTest" -#include #include #include #include #include -#include #include #include #include diff --git a/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp b/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp index 2d9a233337..135940df9d 100644 --- a/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp +++ b/audio/aidl/vts/VtsHalBassBoostTargetTest.cpp @@ -14,9 +14,6 @@ * limitations under the License. */ -#include - -#include #define LOG_TAG "VtsHalBassBoostTest" #include diff --git a/audio/aidl/vts/VtsHalDownmixTargetTest.cpp b/audio/aidl/vts/VtsHalDownmixTargetTest.cpp index d7db567a0b..2272e921a9 100644 --- a/audio/aidl/vts/VtsHalDownmixTargetTest.cpp +++ b/audio/aidl/vts/VtsHalDownmixTargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalDownmixTargetTest" #include diff --git a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp index 2650f49cb2..3f7a76dae6 100644 --- a/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp +++ b/audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp @@ -18,7 +18,6 @@ #include #include -#include #define LOG_TAG "VtsHalDynamicsProcessingTest" #include diff --git a/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp b/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp index 474b3610ea..765c37739f 100644 --- a/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp +++ b/audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalEnvironmentalReverbTest" #include diff --git a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp index 09396d1c88..76838cef5a 100644 --- a/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalEqualizerTargetTest.cpp @@ -15,15 +15,10 @@ */ #include -#include -#include -#include -#include #include #include #include -#include #include #include #define LOG_TAG "VtsHalEqualizerTest" diff --git a/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp b/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp index 5a32398b28..d31211146d 100644 --- a/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp +++ b/audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp @@ -18,7 +18,6 @@ #include #include -#include #define LOG_TAG "VtsHalHapticGeneratorTargetTest" #include #include diff --git a/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp b/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp index 925f9ecc86..7f0091f221 100644 --- a/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp @@ -16,7 +16,6 @@ #include -#include #define LOG_TAG "VtsHalLoudnessEnhancerTest" #include diff --git a/audio/aidl/vts/VtsHalNSTargetTest.cpp b/audio/aidl/vts/VtsHalNSTargetTest.cpp index 12d56b0151..5c1351294b 100644 --- a/audio/aidl/vts/VtsHalNSTargetTest.cpp +++ b/audio/aidl/vts/VtsHalNSTargetTest.cpp @@ -16,7 +16,6 @@ #include -#include #include #define LOG_TAG "VtsHalNSParamTest" #include diff --git a/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp b/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp index 57eda0992c..1453495862 100644 --- a/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp +++ b/audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalPresetReverbTargetTest" #include #include diff --git a/audio/aidl/vts/VtsHalSpatializerTargetTest.cpp b/audio/aidl/vts/VtsHalSpatializerTargetTest.cpp index e2fe38d2ba..f0b51b98c5 100644 --- a/audio/aidl/vts/VtsHalSpatializerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalSpatializerTargetTest.cpp @@ -14,8 +14,6 @@ * limitations under the License. */ -#include - #define LOG_TAG "VtsHalSpatializerTest" #include diff --git a/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp b/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp index 3e39d3a67d..0c24f90fce 100644 --- a/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalVirtualizerTest" #include diff --git a/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp b/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp index 1b8352b8ca..db837159a8 100644 --- a/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp +++ b/audio/aidl/vts/VtsHalVisualizerTargetTest.cpp @@ -16,7 +16,6 @@ #include -#include #define LOG_TAG "VtsHalVisualizerTest" #include #include diff --git a/audio/aidl/vts/VtsHalVolumeTargetTest.cpp b/audio/aidl/vts/VtsHalVolumeTargetTest.cpp index 257100b9cf..aa2c05f61b 100644 --- a/audio/aidl/vts/VtsHalVolumeTargetTest.cpp +++ b/audio/aidl/vts/VtsHalVolumeTargetTest.cpp @@ -14,7 +14,6 @@ * limitations under the License. */ -#include #define LOG_TAG "VtsHalVolumeTest" #include From 52da94e2908318bdab281d5d0cdb74c82fd50d0f Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Thu, 14 Dec 2023 02:28:03 +0000 Subject: [PATCH 2/2] Effect AIDL: cleanup dependencies Bug: 316236907 Test: Enable AIDL and build Test: atest --test-mapping hardware/interfaces/audio/aidl/vts Change-Id: Id1e28b5852a1a8c154f31f4918326de7df8bfc54 --- audio/aidl/default/Android.bp | 1 + .../default/acousticEchoCanceler/Android.bp | 2 - .../default/automaticGainControlV1/Android.bp | 2 - .../default/automaticGainControlV2/Android.bp | 2 - audio/aidl/default/bassboost/Android.bp | 2 - audio/aidl/default/downmix/Android.bp | 2 - .../aidl/default/dynamicProcessing/Android.bp | 2 - audio/aidl/default/envReverb/Android.bp | 2 - audio/aidl/default/equalizer/Android.bp | 2 - audio/aidl/default/extension/Android.bp | 2 - audio/aidl/default/hapticGenerator/Android.bp | 2 - .../aidl/default/loudnessEnhancer/Android.bp | 2 - .../aidl/default/noiseSuppression/Android.bp | 2 - audio/aidl/default/presetReverb/Android.bp | 2 - audio/aidl/default/spatializer/Android.bp | 2 - audio/aidl/default/virtualizer/Android.bp | 2 - audio/aidl/default/visualizer/Android.bp | 2 - audio/aidl/default/volume/Android.bp | 2 - audio/aidl/vts/Android.bp | 48 +++++++++++-------- 19 files changed, 30 insertions(+), 53 deletions(-) diff --git a/audio/aidl/default/Android.bp b/audio/aidl/default/Android.bp index 949b654cd3..6d0b95ef12 100644 --- a/audio/aidl/default/Android.bp +++ b/audio/aidl/default/Android.bp @@ -200,6 +200,7 @@ cc_defaults { vendor: true, shared_libs: [ "libaudioaidlcommon", + "libaudioutils", "libbase", "libbinder_ndk", "libcutils", diff --git a/audio/aidl/default/acousticEchoCanceler/Android.bp b/audio/aidl/default/acousticEchoCanceler/Android.bp index bfb72129a5..35d4a56e21 100644 --- a/audio/aidl/default/acousticEchoCanceler/Android.bp +++ b/audio/aidl/default/acousticEchoCanceler/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libaecsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "AcousticEchoCancelerSw.cpp", diff --git a/audio/aidl/default/automaticGainControlV1/Android.bp b/audio/aidl/default/automaticGainControlV1/Android.bp index 4ae8e63709..05c2c543d7 100644 --- a/audio/aidl/default/automaticGainControlV1/Android.bp +++ b/audio/aidl/default/automaticGainControlV1/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libagc1sw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "AutomaticGainControlV1Sw.cpp", diff --git a/audio/aidl/default/automaticGainControlV2/Android.bp b/audio/aidl/default/automaticGainControlV2/Android.bp index 631cf58d23..dedc555a82 100644 --- a/audio/aidl/default/automaticGainControlV2/Android.bp +++ b/audio/aidl/default/automaticGainControlV2/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libagc2sw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "AutomaticGainControlV2Sw.cpp", diff --git a/audio/aidl/default/bassboost/Android.bp b/audio/aidl/default/bassboost/Android.bp index 82b2f203b9..9f4777025c 100644 --- a/audio/aidl/default/bassboost/Android.bp +++ b/audio/aidl/default/bassboost/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libbassboostsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "BassBoostSw.cpp", diff --git a/audio/aidl/default/downmix/Android.bp b/audio/aidl/default/downmix/Android.bp index 6d15cdb0cd..86572830d6 100644 --- a/audio/aidl/default/downmix/Android.bp +++ b/audio/aidl/default/downmix/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libdownmixsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "DownmixSw.cpp", diff --git a/audio/aidl/default/dynamicProcessing/Android.bp b/audio/aidl/default/dynamicProcessing/Android.bp index 1c0312d36e..c0a648de5e 100644 --- a/audio/aidl/default/dynamicProcessing/Android.bp +++ b/audio/aidl/default/dynamicProcessing/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libdynamicsprocessingsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "DynamicsProcessingSw.cpp", diff --git a/audio/aidl/default/envReverb/Android.bp b/audio/aidl/default/envReverb/Android.bp index dd4219a5b8..2443c2ac3a 100644 --- a/audio/aidl/default/envReverb/Android.bp +++ b/audio/aidl/default/envReverb/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libenvreverbsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "EnvReverbSw.cpp", diff --git a/audio/aidl/default/equalizer/Android.bp b/audio/aidl/default/equalizer/Android.bp index 3610563cf7..42708d1253 100644 --- a/audio/aidl/default/equalizer/Android.bp +++ b/audio/aidl/default/equalizer/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libequalizersw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "EqualizerSw.cpp", diff --git a/audio/aidl/default/extension/Android.bp b/audio/aidl/default/extension/Android.bp index 4e5d352ac8..5fee479f93 100644 --- a/audio/aidl/default/extension/Android.bp +++ b/audio/aidl/default/extension/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libextensioneffect", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "ExtensionEffect.cpp", diff --git a/audio/aidl/default/hapticGenerator/Android.bp b/audio/aidl/default/hapticGenerator/Android.bp index 0df9a9412d..8fb9a3dbbd 100644 --- a/audio/aidl/default/hapticGenerator/Android.bp +++ b/audio/aidl/default/hapticGenerator/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libhapticgeneratorsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "HapticGeneratorSw.cpp", diff --git a/audio/aidl/default/loudnessEnhancer/Android.bp b/audio/aidl/default/loudnessEnhancer/Android.bp index 89a72fe469..cd44b50206 100644 --- a/audio/aidl/default/loudnessEnhancer/Android.bp +++ b/audio/aidl/default/loudnessEnhancer/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libloudnessenhancersw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "LoudnessEnhancerSw.cpp", diff --git a/audio/aidl/default/noiseSuppression/Android.bp b/audio/aidl/default/noiseSuppression/Android.bp index dad3d49d47..f24ded6fac 100644 --- a/audio/aidl/default/noiseSuppression/Android.bp +++ b/audio/aidl/default/noiseSuppression/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libnssw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "NoiseSuppressionSw.cpp", diff --git a/audio/aidl/default/presetReverb/Android.bp b/audio/aidl/default/presetReverb/Android.bp index 18bdd17b29..d6001410e9 100644 --- a/audio/aidl/default/presetReverb/Android.bp +++ b/audio/aidl/default/presetReverb/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libpresetreverbsw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "PresetReverbSw.cpp", diff --git a/audio/aidl/default/spatializer/Android.bp b/audio/aidl/default/spatializer/Android.bp index 41fb323a1b..05ed365c01 100644 --- a/audio/aidl/default/spatializer/Android.bp +++ b/audio/aidl/default/spatializer/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libspatializersw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "SpatializerSw.cpp", diff --git a/audio/aidl/default/virtualizer/Android.bp b/audio/aidl/default/virtualizer/Android.bp index ed0199df72..1c41bb5dd9 100644 --- a/audio/aidl/default/virtualizer/Android.bp +++ b/audio/aidl/default/virtualizer/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libvirtualizersw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "VirtualizerSw.cpp", diff --git a/audio/aidl/default/visualizer/Android.bp b/audio/aidl/default/visualizer/Android.bp index 091daa243f..68f71777de 100644 --- a/audio/aidl/default/visualizer/Android.bp +++ b/audio/aidl/default/visualizer/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libvisualizersw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "VisualizerSw.cpp", diff --git a/audio/aidl/default/volume/Android.bp b/audio/aidl/default/volume/Android.bp index 418bb8d0cd..f1a051f522 100644 --- a/audio/aidl/default/volume/Android.bp +++ b/audio/aidl/default/volume/Android.bp @@ -27,8 +27,6 @@ cc_library_shared { name: "libvolumesw", defaults: [ "aidlaudioeffectservice_defaults", - "latest_android_media_audio_common_types_ndk_shared", - "latest_android_hardware_audio_effect_ndk_shared", ], srcs: [ "VolumeSw.cpp", diff --git a/audio/aidl/vts/Android.bp b/audio/aidl/vts/Android.bp index 1cfa86ec98..9b0e233261 100644 --- a/audio/aidl/vts/Android.bp +++ b/audio/aidl/vts/Android.bp @@ -41,11 +41,21 @@ cc_defaults { "vts", ], srcs: [ - ":effectCommonFile", "TestUtils.cpp", ], } +cc_defaults { + name: "VtsHalAudioEffectTargetTestDefaults", + defaults: [ + "latest_android_hardware_audio_effect_ndk_static", + "VtsHalAudioTargetTestDefaults", + ], + srcs: [ + ":effectCommonFile", + ], +} + cc_test { name: "VtsHalAudioCoreTargetTest", defaults: [ @@ -66,25 +76,25 @@ cc_test { cc_test { name: "VtsHalAudioEffectFactoryTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalAudioEffectFactoryTargetTest.cpp"], } cc_test { name: "VtsHalAudioEffectTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalAudioEffectTargetTest.cpp"], } cc_test { name: "VtsHalBassBoostTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalBassBoostTargetTest.cpp"], } cc_test { name: "VtsHalDownmixTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalDownmixTargetTest.cpp"], shared_libs: [ "libaudioutils", @@ -93,85 +103,85 @@ cc_test { cc_test { name: "VtsHalDynamicsProcessingTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], static_libs: ["libaudioaidlranges"], srcs: ["VtsHalDynamicsProcessingTest.cpp"], } cc_test { name: "VtsHalEnvironmentalReverbTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalEnvironmentalReverbTargetTest.cpp"], } cc_test { name: "VtsHalEqualizerTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalEqualizerTargetTest.cpp"], } cc_test { name: "VtsHalHapticGeneratorTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalHapticGeneratorTargetTest.cpp"], } cc_test { name: "VtsHalLoudnessEnhancerTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalLoudnessEnhancerTargetTest.cpp"], } cc_test { name: "VtsHalPresetReverbTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalPresetReverbTargetTest.cpp"], } cc_test { name: "VtsHalVirtualizerTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalVirtualizerTargetTest.cpp"], } cc_test { name: "VtsHalVisualizerTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalVisualizerTargetTest.cpp"], } cc_test { name: "VtsHalVolumeTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalVolumeTargetTest.cpp"], } cc_test { name: "VtsHalAECTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalAECTargetTest.cpp"], } cc_test { name: "VtsHalAGC1TargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalAGC1TargetTest.cpp"], } cc_test { name: "VtsHalAGC2TargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalAGC2TargetTest.cpp"], } cc_test { name: "VtsHalNSTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalNSTargetTest.cpp"], } cc_test { name: "VtsHalSpatializerTargetTest", - defaults: ["VtsHalAudioTargetTestDefaults"], + defaults: ["VtsHalAudioEffectTargetTestDefaults"], srcs: ["VtsHalSpatializerTargetTest.cpp"], }