Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from topic "effect_ dependencies" into main am: 996e1ad8b7 am: 77af530748

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2875179

Change-Id: Ifd127e32adc5bc107c2c9511a5c6601c89626ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shunkai Yao
2023-12-19 22:25:10 +00:00
committed by Automerger Merge Worker
parent ae22828ac5 77af530748
commit ecfc88acec
19 changed files with 30 additions and 53 deletions
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, vendor: true,
shared_libs: [ shared_libs: [
"libaudioaidlcommon", "libaudioaidlcommon",
"libaudioutils",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcutils", "libcutils",

2
audio/aidl/default/acousticEchoCanceler/Android.bp
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",

2
audio/aidl/default/automaticGainControlV1/Android.bp
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",

2
audio/aidl/default/automaticGainControlV2/Android.bp
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",

2
audio/aidl/default/bassboost/Android.bp
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",

2
audio/aidl/default/downmix/Android.bp
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",

2
audio/aidl/default/dynamicProcessing/Android.bp
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",

2
audio/aidl/default/envReverb/Android.bp
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",

2
audio/aidl/default/equalizer/Android.bp
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",

2
audio/aidl/default/extension/Android.bp
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",

2
audio/aidl/default/hapticGenerator/Android.bp
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",

2
audio/aidl/default/loudnessEnhancer/Android.bp
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",

2
audio/aidl/default/noiseSuppression/Android.bp
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",

2
audio/aidl/default/presetReverb/Android.bp
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",

2
audio/aidl/default/spatializer/Android.bp
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",

2
audio/aidl/default/virtualizer/Android.bp
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",

2
audio/aidl/default/visualizer/Android.bp
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",

2
audio/aidl/default/volume/Android.bp
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",

48
audio/aidl/vts/Android.bp
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"],
} }