audio: move audio hal hidl mk to gs-common.
Bug: 259161622
Test: build pass and check audio function with HIDL service
Change-Id: I4a72f00be1c9eafc92cab5ff7ef93a688f82eb75
Signed-off-by: Jasmine Cha <chajasmine@google.com>
diff --git a/device.mk b/device.mk
index e289cec..bb93ced 100644
--- a/device.mk
+++ b/device.mk
@@ -1018,63 +1018,7 @@
# Audio
# Audio HAL Server & Default Implementations
-PRODUCT_PACKAGES += \
- android.hardware.audio.service \
- android.hardware.audio@7.1-impl \
- android.hardware.audio.effect@7.0-impl \
- android.hardware.soundtrigger@2.3-impl \
- vendor.google.whitechapel.audio.audioext@4.0-impl \
- android.hardware.bluetooth.audio-impl \
-
-#
-##Audio HAL libraries
-PRODUCT_PACKAGES += \
- audio.primary.$(TARGET_BOARD_PLATFORM) \
- audio.platform.aoc \
- audio_tunnel_aoc \
- aoc_aud_ext \
- libaoctuningdecoder \
- liboffloadeffect \
- audio_bt_aoc \
- audio_waves_aoc \
- audio_fortemedia_aoc \
- audio_bluenote_aoc \
- audio_usb_aoc \
- audio_cca_aoc \
- libamcsextfile \
- audio_amcs_ext \
- audio.usb.default \
- audio.usbv2.default \
- audio.bluetooth.default \
- audio.r_submix.default \
- audio_spk_35l41 \
- sound_trigger.primary.$(TARGET_BOARD_PLATFORM)
-# libaoc_waves \
-#
-
-##Audio Vendor libraries
-PRODUCT_PACKAGES += \
- libfvsam_prm_parser \
- libmahalcontroller \
- libAlgFx_HiFi3z
-#
-## AudioHAL Configurations
-PRODUCT_COPY_FILES += \
- frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration_7_0.xml \
- frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration_7_0.xml \
- frameworks/av/services/audiopolicy/config/hearing_aid_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/hearing_aid_audio_policy_configuration_7_0.xml \
- frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
- frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
-
-##Audio soong
-PRODUCT_SOONG_NAMESPACES += \
- vendor/google/whitechapel/audio/hal \
- vendor/google/whitechapel/audio/interfaces
-
-$(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM))
+include device/google/gs-common/audio/hidl_gs201.mk
## AoC soong
PRODUCT_SOONG_NAMESPACES += \
diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 6b11a84..5d6cf69 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -155,14 +155,6 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>vendor.google.whitechapel.audio.audioext</name>
- <version>4.0</version>
- <interface>
- <name>IAudioExt</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="aidl" optional="true">
<name>vendor.google.wifi_ext</name>
<version>1</version>
@@ -189,12 +181,4 @@
<instance>rilExternal</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>vendor.google.audiometricext</name>
- <version>1.0</version>
- <interface>
- <name>IAudioMetricExt</name>
- <instance>default</instance>
- </interface>
- </hal>
</compatibility-matrix>
diff --git a/manifest-gralloc3.xml b/manifest-gralloc3.xml
index 9ecea75..c890030 100644
--- a/manifest-gralloc3.xml
+++ b/manifest-gralloc3.xml
@@ -1,31 +1,4 @@
<manifest version="1.0" type="device" target-level="7">
- <hal format="hidl">
- <name>android.hardware.audio</name>
- <transport>hwbinder</transport>
- <version>7.1</version>
- <interface>
- <name>IDevicesFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.audio.effect</name>
- <transport>hwbinder</transport>
- <version>7.0</version>
- <interface>
- <name>IEffectsFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.soundtrigger</name>
- <transport>hwbinder</transport>
- <version>2.3</version>
- <interface>
- <name>ISoundTriggerHw</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl">
<name>android.hardware.graphics.allocator</name>
<transport>hwbinder</transport>
@@ -139,22 +112,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>vendor.google.whitechapel.audio.audioext</name>
- <transport>hwbinder</transport>
- <version>4.0</version>
- <interface>
- <name>IAudioExt</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>vendor.google.audiometricext</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IAudioMetricExt</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>
diff --git a/manifest.xml b/manifest.xml
index 9cb4738..402cbba 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,31 +1,4 @@
<manifest version="1.0" type="device" target-level="7">
- <hal format="hidl">
- <name>android.hardware.audio</name>
- <transport>hwbinder</transport>
- <version>7.1</version>
- <interface>
- <name>IDevicesFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.audio.effect</name>
- <transport>hwbinder</transport>
- <version>7.0</version>
- <interface>
- <name>IEffectsFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.soundtrigger</name>
- <transport>hwbinder</transport>
- <version>2.3</version>
- <interface>
- <name>ISoundTriggerHw</name>
- <instance>default</instance>
- </interface>
- </hal>
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
@@ -57,22 +30,4 @@
<instance>default</instance>
</interface>
</hal>
- <hal format="hidl">
- <name>vendor.google.whitechapel.audio.audioext</name>
- <transport>hwbinder</transport>
- <version>4.0</version>
- <interface>
- <name>IAudioExt</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>vendor.google.audiometricext</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IAudioMetricExt</name>
- <instance>default</instance>
- </interface>
- </hal>
</manifest>
