tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "effect_ dependencies" into main

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
audio/aidl/default/Android.bp
View file

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

2
audio/aidl/default/acousticEchoCanceler/Android.bp
View file

@ -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",

2
audio/aidl/default/automaticGainControlV1/Android.bp
View file

@ -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",

2
audio/aidl/default/automaticGainControlV2/Android.bp
View file

@ -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",

2
audio/aidl/default/bassboost/Android.bp
View file

@ -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",

2
audio/aidl/default/downmix/Android.bp
View file

@ -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",

2
audio/aidl/default/dynamicProcessing/Android.bp
View file

@ -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",

2
audio/aidl/default/envReverb/Android.bp
View file

@ -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",

2
audio/aidl/default/equalizer/Android.bp
View file

@ -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",

2
audio/aidl/default/extension/Android.bp
View file

@ -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",

2
audio/aidl/default/hapticGenerator/Android.bp
View file

@ -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",

2
audio/aidl/default/loudnessEnhancer/Android.bp
View file

@ -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",

2
audio/aidl/default/noiseSuppression/Android.bp
View file

@ -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",

2
audio/aidl/default/presetReverb/Android.bp
View file

@ -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",

2
audio/aidl/default/spatializer/Android.bp
View file

@ -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",

2
audio/aidl/default/virtualizer/Android.bp
View file

@ -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",

2
audio/aidl/default/visualizer/Android.bp
View file

@ -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",

2
audio/aidl/default/volume/Android.bp
View file

@ -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",

48
audio/aidl/vts/Android.bp
View file

@ -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"],
}

1
audio/aidl/vts/EffectFactoryHelper.h
View file

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

1
audio/aidl/vts/VtsHalAECTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalAGC1TargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalAGC2TargetTest.cpp
View file

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

2
audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp
View file

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

3
audio/aidl/vts/VtsHalBassBoostTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalDownmixTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalDynamicsProcessingTest.cpp
View file

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

1
audio/aidl/vts/VtsHalEnvironmentalReverbTargetTest.cpp
View file

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

5
audio/aidl/vts/VtsHalEqualizerTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalHapticGeneratorTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalLoudnessEnhancerTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalNSTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalPresetReverbTargetTest.cpp
View file

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

2
audio/aidl/vts/VtsHalSpatializerTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalVirtualizerTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalVisualizerTargetTest.cpp
View file

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

1
audio/aidl/vts/VtsHalVolumeTargetTest.cpp
View file

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