Merge changes from topic "effect_ dependencies" into main

* changes:
  Effect AIDL: cleanup dependencies
  Update VTS header includes
This commit is contained in:
Shunkai Yao 2023-12-19 21:07:35 +00:00 committed by Gerrit Code Review
commit 996e1ad8b7
37 changed files with 31 additions and 78 deletions

View file

@ -200,6 +200,7 @@ cc_defaults {
vendor: true, vendor: true,
shared_libs: [ shared_libs: [
"libaudioaidlcommon", "libaudioaidlcommon",
"libaudioutils",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcutils", "libcutils",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libaecsw", name: "libaecsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"AcousticEchoCancelerSw.cpp", "AcousticEchoCancelerSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libagc1sw", name: "libagc1sw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"AutomaticGainControlV1Sw.cpp", "AutomaticGainControlV1Sw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libagc2sw", name: "libagc2sw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"AutomaticGainControlV2Sw.cpp", "AutomaticGainControlV2Sw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libbassboostsw", name: "libbassboostsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"BassBoostSw.cpp", "BassBoostSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libdownmixsw", name: "libdownmixsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"DownmixSw.cpp", "DownmixSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libdynamicsprocessingsw", name: "libdynamicsprocessingsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"DynamicsProcessingSw.cpp", "DynamicsProcessingSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libenvreverbsw", name: "libenvreverbsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"EnvReverbSw.cpp", "EnvReverbSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libequalizersw", name: "libequalizersw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"EqualizerSw.cpp", "EqualizerSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libextensioneffect", name: "libextensioneffect",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"ExtensionEffect.cpp", "ExtensionEffect.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libhapticgeneratorsw", name: "libhapticgeneratorsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"HapticGeneratorSw.cpp", "HapticGeneratorSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libloudnessenhancersw", name: "libloudnessenhancersw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"LoudnessEnhancerSw.cpp", "LoudnessEnhancerSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libnssw", name: "libnssw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"NoiseSuppressionSw.cpp", "NoiseSuppressionSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libpresetreverbsw", name: "libpresetreverbsw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"PresetReverbSw.cpp", "PresetReverbSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libspatializersw", name: "libspatializersw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"SpatializerSw.cpp", "SpatializerSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libvirtualizersw", name: "libvirtualizersw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"VirtualizerSw.cpp", "VirtualizerSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libvisualizersw", name: "libvisualizersw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"VisualizerSw.cpp", "VisualizerSw.cpp",

View file

@ -27,8 +27,6 @@ cc_library_shared {
name: "libvolumesw", name: "libvolumesw",
defaults: [ defaults: [
"aidlaudioeffectservice_defaults", "aidlaudioeffectservice_defaults",
"latest_android_media_audio_common_types_ndk_shared",
"latest_android_hardware_audio_effect_ndk_shared",
], ],
srcs: [ srcs: [
"VolumeSw.cpp", "VolumeSw.cpp",

View file

@ -41,11 +41,21 @@ cc_defaults {
"vts", "vts",
], ],
srcs: [ srcs: [
":effectCommonFile",
"TestUtils.cpp", "TestUtils.cpp",
], ],
} }
cc_defaults {
name: "VtsHalAudioEffectTargetTestDefaults",
defaults: [
"latest_android_hardware_audio_effect_ndk_static",
"VtsHalAudioTargetTestDefaults",
],
srcs: [
":effectCommonFile",
],
}
cc_test { cc_test {
name: "VtsHalAudioCoreTargetTest", name: "VtsHalAudioCoreTargetTest",
defaults: [ defaults: [
@ -66,25 +76,25 @@ cc_test {
cc_test { cc_test {
name: "VtsHalAudioEffectFactoryTargetTest", name: "VtsHalAudioEffectFactoryTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalAudioEffectFactoryTargetTest.cpp"], srcs: ["VtsHalAudioEffectFactoryTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalAudioEffectTargetTest", name: "VtsHalAudioEffectTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalAudioEffectTargetTest.cpp"], srcs: ["VtsHalAudioEffectTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalBassBoostTargetTest", name: "VtsHalBassBoostTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalBassBoostTargetTest.cpp"], srcs: ["VtsHalBassBoostTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalDownmixTargetTest", name: "VtsHalDownmixTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalDownmixTargetTest.cpp"], srcs: ["VtsHalDownmixTargetTest.cpp"],
shared_libs: [ shared_libs: [
"libaudioutils", "libaudioutils",
@ -93,85 +103,85 @@ cc_test {
cc_test { cc_test {
name: "VtsHalDynamicsProcessingTargetTest", name: "VtsHalDynamicsProcessingTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
static_libs: ["libaudioaidlranges"], static_libs: ["libaudioaidlranges"],
srcs: ["VtsHalDynamicsProcessingTest.cpp"], srcs: ["VtsHalDynamicsProcessingTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalEnvironmentalReverbTargetTest", name: "VtsHalEnvironmentalReverbTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalEnvironmentalReverbTargetTest.cpp"], srcs: ["VtsHalEnvironmentalReverbTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalEqualizerTargetTest", name: "VtsHalEqualizerTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalEqualizerTargetTest.cpp"], srcs: ["VtsHalEqualizerTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalHapticGeneratorTargetTest", name: "VtsHalHapticGeneratorTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalHapticGeneratorTargetTest.cpp"], srcs: ["VtsHalHapticGeneratorTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalLoudnessEnhancerTargetTest", name: "VtsHalLoudnessEnhancerTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalLoudnessEnhancerTargetTest.cpp"], srcs: ["VtsHalLoudnessEnhancerTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalPresetReverbTargetTest", name: "VtsHalPresetReverbTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalPresetReverbTargetTest.cpp"], srcs: ["VtsHalPresetReverbTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalVirtualizerTargetTest", name: "VtsHalVirtualizerTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalVirtualizerTargetTest.cpp"], srcs: ["VtsHalVirtualizerTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalVisualizerTargetTest", name: "VtsHalVisualizerTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalVisualizerTargetTest.cpp"], srcs: ["VtsHalVisualizerTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalVolumeTargetTest", name: "VtsHalVolumeTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalVolumeTargetTest.cpp"], srcs: ["VtsHalVolumeTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalAECTargetTest", name: "VtsHalAECTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalAECTargetTest.cpp"], srcs: ["VtsHalAECTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalAGC1TargetTest", name: "VtsHalAGC1TargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalAGC1TargetTest.cpp"], srcs: ["VtsHalAGC1TargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalAGC2TargetTest", name: "VtsHalAGC2TargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalAGC2TargetTest.cpp"], srcs: ["VtsHalAGC2TargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalNSTargetTest", name: "VtsHalNSTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalNSTargetTest.cpp"], srcs: ["VtsHalNSTargetTest.cpp"],
} }
cc_test { cc_test {
name: "VtsHalSpatializerTargetTest", name: "VtsHalSpatializerTargetTest",
defaults: ["VtsHalAudioTargetTestDefaults"], defaults: ["VtsHalAudioEffectTargetTestDefaults"],
srcs: ["VtsHalSpatializerTargetTest.cpp"], srcs: ["VtsHalSpatializerTargetTest.cpp"],
} }

View file

@ -21,6 +21,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <aidl/Vintf.h>
#include <android/binder_auto_utils.h> #include <android/binder_auto_utils.h>
#include "TestUtils.h" #include "TestUtils.h"

View file

@ -18,7 +18,6 @@
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalAECParamTest" #define LOG_TAG "VtsHalAECParamTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalAGC1ParamTest" #define LOG_TAG "VtsHalAGC1ParamTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalAGC2ParamTest" #define LOG_TAG "VtsHalAGC2ParamTest"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android/binder_enums.h> #include <android/binder_enums.h>

View file

@ -16,13 +16,11 @@
#define LOG_TAG "VtsHalAudioEffectTargetTest" #define LOG_TAG "VtsHalAudioEffectTargetTest"
#include <chrono>
#include <memory> #include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <aidl/Gtest.h> #include <aidl/Gtest.h>
#include <aidl/Vintf.h>
#include <aidl/android/hardware/audio/effect/IEffect.h> #include <aidl/android/hardware/audio/effect/IEffect.h>
#include <aidl/android/hardware/audio/effect/IFactory.h> #include <aidl/android/hardware/audio/effect/IFactory.h>
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,9 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <limits.h>
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalBassBoostTest" #define LOG_TAG "VtsHalBassBoostTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalDownmixTargetTest" #define LOG_TAG "VtsHalDownmixTargetTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -18,7 +18,6 @@
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalDynamicsProcessingTest" #define LOG_TAG "VtsHalDynamicsProcessingTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalEnvironmentalReverbTest" #define LOG_TAG "VtsHalEnvironmentalReverbTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -15,15 +15,10 @@
*/ */
#include <algorithm> #include <algorithm>
#include <limits>
#include <map>
#include <memory>
#include <optional>
#include <string> #include <string>
#include <vector> #include <vector>
#include <aidl/Gtest.h> #include <aidl/Gtest.h>
#include <aidl/Vintf.h>
#include <aidl/android/hardware/audio/effect/IEffect.h> #include <aidl/android/hardware/audio/effect/IEffect.h>
#include <aidl/android/hardware/audio/effect/IFactory.h> #include <aidl/android/hardware/audio/effect/IFactory.h>
#define LOG_TAG "VtsHalEqualizerTest" #define LOG_TAG "VtsHalEqualizerTest"

View file

@ -18,7 +18,6 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalHapticGeneratorTargetTest" #define LOG_TAG "VtsHalHapticGeneratorTargetTest"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android/binder_enums.h> #include <android/binder_enums.h>

View file

@ -16,7 +16,6 @@
#include <string> #include <string>
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalLoudnessEnhancerTest" #define LOG_TAG "VtsHalLoudnessEnhancerTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -16,7 +16,6 @@
#include <unordered_set> #include <unordered_set>
#include <aidl/Vintf.h>
#include <aidl/android/hardware/audio/effect/NoiseSuppression.h> #include <aidl/android/hardware/audio/effect/NoiseSuppression.h>
#define LOG_TAG "VtsHalNSParamTest" #define LOG_TAG "VtsHalNSParamTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalPresetReverbTargetTest" #define LOG_TAG "VtsHalPresetReverbTargetTest"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android/binder_enums.h> #include <android/binder_enums.h>

View file

@ -14,8 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalSpatializerTest" #define LOG_TAG "VtsHalSpatializerTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalVirtualizerTest" #define LOG_TAG "VtsHalVirtualizerTest"
#include <android-base/logging.h> #include <android-base/logging.h>

View file

@ -16,7 +16,6 @@
#include <unordered_set> #include <unordered_set>
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalVisualizerTest" #define LOG_TAG "VtsHalVisualizerTest"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android/binder_enums.h> #include <android/binder_enums.h>

View file

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include <aidl/Vintf.h>
#define LOG_TAG "VtsHalVolumeTest" #define LOG_TAG "VtsHalVolumeTest"
#include <android-base/logging.h> #include <android-base/logging.h>