Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp
index 09fd3a4..c4f8b06 100644
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -1,7 +1,11 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.audio.effect@2.0_hal",
+hidl_interface {
+ name: "android.hardware.audio.effect@2.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IAcousticEchoCancelerEffect.hal",
@@ -19,265 +23,25 @@
"IVirtualizerEffect.hal",
"IVisualizerEffect.hal",
],
-}
-
-genrule {
- name: "android.hardware.audio.effect@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
- srcs: [
- ":android.hardware.audio.effect@2.0_hal",
- ],
- out: [
- "android/hardware/audio/effect/2.0/types.cpp",
- "android/hardware/audio/effect/2.0/AcousticEchoCancelerEffectAll.cpp",
- "android/hardware/audio/effect/2.0/AutomaticGainControlEffectAll.cpp",
- "android/hardware/audio/effect/2.0/BassBoostEffectAll.cpp",
- "android/hardware/audio/effect/2.0/DownmixEffectAll.cpp",
- "android/hardware/audio/effect/2.0/EffectAll.cpp",
- "android/hardware/audio/effect/2.0/EffectBufferProviderCallbackAll.cpp",
- "android/hardware/audio/effect/2.0/EffectsFactoryAll.cpp",
- "android/hardware/audio/effect/2.0/EnvironmentalReverbEffectAll.cpp",
- "android/hardware/audio/effect/2.0/EqualizerEffectAll.cpp",
- "android/hardware/audio/effect/2.0/LoudnessEnhancerEffectAll.cpp",
- "android/hardware/audio/effect/2.0/NoiseSuppressionEffectAll.cpp",
- "android/hardware/audio/effect/2.0/PresetReverbEffectAll.cpp",
- "android/hardware/audio/effect/2.0/VirtualizerEffectAll.cpp",
- "android/hardware/audio/effect/2.0/VisualizerEffectAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.audio.effect@2.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
- srcs: [
- ":android.hardware.audio.effect@2.0_hal",
- ],
- out: [
- "android/hardware/audio/effect/2.0/types.h",
- "android/hardware/audio/effect/2.0/hwtypes.h",
- "android/hardware/audio/effect/2.0/IAcousticEchoCancelerEffect.h",
- "android/hardware/audio/effect/2.0/IHwAcousticEchoCancelerEffect.h",
- "android/hardware/audio/effect/2.0/BnHwAcousticEchoCancelerEffect.h",
- "android/hardware/audio/effect/2.0/BpHwAcousticEchoCancelerEffect.h",
- "android/hardware/audio/effect/2.0/BsAcousticEchoCancelerEffect.h",
- "android/hardware/audio/effect/2.0/IAutomaticGainControlEffect.h",
- "android/hardware/audio/effect/2.0/IHwAutomaticGainControlEffect.h",
- "android/hardware/audio/effect/2.0/BnHwAutomaticGainControlEffect.h",
- "android/hardware/audio/effect/2.0/BpHwAutomaticGainControlEffect.h",
- "android/hardware/audio/effect/2.0/BsAutomaticGainControlEffect.h",
- "android/hardware/audio/effect/2.0/IBassBoostEffect.h",
- "android/hardware/audio/effect/2.0/IHwBassBoostEffect.h",
- "android/hardware/audio/effect/2.0/BnHwBassBoostEffect.h",
- "android/hardware/audio/effect/2.0/BpHwBassBoostEffect.h",
- "android/hardware/audio/effect/2.0/BsBassBoostEffect.h",
- "android/hardware/audio/effect/2.0/IDownmixEffect.h",
- "android/hardware/audio/effect/2.0/IHwDownmixEffect.h",
- "android/hardware/audio/effect/2.0/BnHwDownmixEffect.h",
- "android/hardware/audio/effect/2.0/BpHwDownmixEffect.h",
- "android/hardware/audio/effect/2.0/BsDownmixEffect.h",
- "android/hardware/audio/effect/2.0/IEffect.h",
- "android/hardware/audio/effect/2.0/IHwEffect.h",
- "android/hardware/audio/effect/2.0/BnHwEffect.h",
- "android/hardware/audio/effect/2.0/BpHwEffect.h",
- "android/hardware/audio/effect/2.0/BsEffect.h",
- "android/hardware/audio/effect/2.0/IEffectBufferProviderCallback.h",
- "android/hardware/audio/effect/2.0/IHwEffectBufferProviderCallback.h",
- "android/hardware/audio/effect/2.0/BnHwEffectBufferProviderCallback.h",
- "android/hardware/audio/effect/2.0/BpHwEffectBufferProviderCallback.h",
- "android/hardware/audio/effect/2.0/BsEffectBufferProviderCallback.h",
- "android/hardware/audio/effect/2.0/IEffectsFactory.h",
- "android/hardware/audio/effect/2.0/IHwEffectsFactory.h",
- "android/hardware/audio/effect/2.0/BnHwEffectsFactory.h",
- "android/hardware/audio/effect/2.0/BpHwEffectsFactory.h",
- "android/hardware/audio/effect/2.0/BsEffectsFactory.h",
- "android/hardware/audio/effect/2.0/IEnvironmentalReverbEffect.h",
- "android/hardware/audio/effect/2.0/IHwEnvironmentalReverbEffect.h",
- "android/hardware/audio/effect/2.0/BnHwEnvironmentalReverbEffect.h",
- "android/hardware/audio/effect/2.0/BpHwEnvironmentalReverbEffect.h",
- "android/hardware/audio/effect/2.0/BsEnvironmentalReverbEffect.h",
- "android/hardware/audio/effect/2.0/IEqualizerEffect.h",
- "android/hardware/audio/effect/2.0/IHwEqualizerEffect.h",
- "android/hardware/audio/effect/2.0/BnHwEqualizerEffect.h",
- "android/hardware/audio/effect/2.0/BpHwEqualizerEffect.h",
- "android/hardware/audio/effect/2.0/BsEqualizerEffect.h",
- "android/hardware/audio/effect/2.0/ILoudnessEnhancerEffect.h",
- "android/hardware/audio/effect/2.0/IHwLoudnessEnhancerEffect.h",
- "android/hardware/audio/effect/2.0/BnHwLoudnessEnhancerEffect.h",
- "android/hardware/audio/effect/2.0/BpHwLoudnessEnhancerEffect.h",
- "android/hardware/audio/effect/2.0/BsLoudnessEnhancerEffect.h",
- "android/hardware/audio/effect/2.0/INoiseSuppressionEffect.h",
- "android/hardware/audio/effect/2.0/IHwNoiseSuppressionEffect.h",
- "android/hardware/audio/effect/2.0/BnHwNoiseSuppressionEffect.h",
- "android/hardware/audio/effect/2.0/BpHwNoiseSuppressionEffect.h",
- "android/hardware/audio/effect/2.0/BsNoiseSuppressionEffect.h",
- "android/hardware/audio/effect/2.0/IPresetReverbEffect.h",
- "android/hardware/audio/effect/2.0/IHwPresetReverbEffect.h",
- "android/hardware/audio/effect/2.0/BnHwPresetReverbEffect.h",
- "android/hardware/audio/effect/2.0/BpHwPresetReverbEffect.h",
- "android/hardware/audio/effect/2.0/BsPresetReverbEffect.h",
- "android/hardware/audio/effect/2.0/IVirtualizerEffect.h",
- "android/hardware/audio/effect/2.0/IHwVirtualizerEffect.h",
- "android/hardware/audio/effect/2.0/BnHwVirtualizerEffect.h",
- "android/hardware/audio/effect/2.0/BpHwVirtualizerEffect.h",
- "android/hardware/audio/effect/2.0/BsVirtualizerEffect.h",
- "android/hardware/audio/effect/2.0/IVisualizerEffect.h",
- "android/hardware/audio/effect/2.0/IHwVisualizerEffect.h",
- "android/hardware/audio/effect/2.0/BnHwVisualizerEffect.h",
- "android/hardware/audio/effect/2.0/BpHwVisualizerEffect.h",
- "android/hardware/audio/effect/2.0/BsVisualizerEffect.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.audio.effect@2.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.audio.effect@2.0_genc++"],
- generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.audio.common@2.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.audio.common@2.0",
+ types: [
+ "AudioBuffer",
+ "EffectAuxChannelsConfig",
+ "EffectBufferAccess",
+ "EffectBufferConfig",
+ "EffectConfig",
+ "EffectConfigParameters",
+ "EffectDescriptor",
+ "EffectFeature",
+ "EffectFlags",
+ "EffectOffloadParameter",
+ "MessageQueueFlagBits",
+ "Result",
],
+ gen_java: false,
+ gen_java_constants: true,
}
-// This package is not java compatible. Not creating java target.
-
-genrule {
- name: "android.hardware.audio.effect-V2.0-java-constants_gen_java",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
- srcs: [
- ":android.hardware.audio.effect@2.0_hal",
- ],
- out: [
- "android/hardware/audio/effect/V2_0/Constants.java",
- ],
-}
-
-java_library {
- name: "android.hardware.audio.effect-V2.0-java-constants",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.audio.effect-V2.0-java-constants_gen_java"],
-}
-
-genrule {
- name: "android.hardware.audio.effect@2.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
- srcs: [
- ":android.hardware.audio.effect@2.0_hal",
- ],
- out: [
- "android/hardware/audio/effect/2.0/AAcousticEchoCancelerEffect.cpp",
- "android/hardware/audio/effect/2.0/AAutomaticGainControlEffect.cpp",
- "android/hardware/audio/effect/2.0/ABassBoostEffect.cpp",
- "android/hardware/audio/effect/2.0/ADownmixEffect.cpp",
- "android/hardware/audio/effect/2.0/AEffect.cpp",
- "android/hardware/audio/effect/2.0/AEffectBufferProviderCallback.cpp",
- "android/hardware/audio/effect/2.0/AEffectsFactory.cpp",
- "android/hardware/audio/effect/2.0/AEnvironmentalReverbEffect.cpp",
- "android/hardware/audio/effect/2.0/AEqualizerEffect.cpp",
- "android/hardware/audio/effect/2.0/ALoudnessEnhancerEffect.cpp",
- "android/hardware/audio/effect/2.0/ANoiseSuppressionEffect.cpp",
- "android/hardware/audio/effect/2.0/APresetReverbEffect.cpp",
- "android/hardware/audio/effect/2.0/AVirtualizerEffect.cpp",
- "android/hardware/audio/effect/2.0/AVisualizerEffect.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.audio.effect@2.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
- srcs: [
- ":android.hardware.audio.effect@2.0_hal",
- ],
- out: [
- "android/hardware/audio/effect/2.0/AAcousticEchoCancelerEffect.h",
- "android/hardware/audio/effect/2.0/AAutomaticGainControlEffect.h",
- "android/hardware/audio/effect/2.0/ABassBoostEffect.h",
- "android/hardware/audio/effect/2.0/ADownmixEffect.h",
- "android/hardware/audio/effect/2.0/AEffect.h",
- "android/hardware/audio/effect/2.0/AEffectBufferProviderCallback.h",
- "android/hardware/audio/effect/2.0/AEffectsFactory.h",
- "android/hardware/audio/effect/2.0/AEnvironmentalReverbEffect.h",
- "android/hardware/audio/effect/2.0/AEqualizerEffect.h",
- "android/hardware/audio/effect/2.0/ALoudnessEnhancerEffect.h",
- "android/hardware/audio/effect/2.0/ANoiseSuppressionEffect.h",
- "android/hardware/audio/effect/2.0/APresetReverbEffect.h",
- "android/hardware/audio/effect/2.0/AVirtualizerEffect.h",
- "android/hardware/audio/effect/2.0/AVisualizerEffect.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.audio.effect@2.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.audio.effect@2.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.audio.effect@2.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.audio.effect@2.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.audio.common@2.0",
- "android.hardware.audio.effect@2.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.audio.common@2.0",
- "android.hardware.audio.effect@2.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.audio.effect@2.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.audio.effect@2.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.audio.effect@2.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.audio.common@2.0",
- "android.hardware.audio.effect@2.0",
- "android.hardware.audio.effect@2.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.audio.effect@2.0-adapter_genc++"],
-}