summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-11-19 17:02:06 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-11-19 17:02:16 +0100
commit764ef80a1d795738ea310ad2a59379a220bf2335 (patch)
tree6c5eb7ddc4eb98fc2821ba50df12a1a8db95fbc8
parentce9073c90abee6d02dffe2f61cbb28f0d98c3dff (diff)
downloaddevice_samsung_midas_common-764ef80a1d795738ea310ad2a59379a220bf2335.tar.gz
device_samsung_midas_common-764ef80a1d795738ea310ad2a59379a220bf2335.tar.bz2
device_samsung_midas_common-764ef80a1d795738ea310ad2a59379a220bf2335.zip
[WIP] Audio: use Android x86 audio
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-rw-r--r--manifest.xml6
-rw-r--r--midas.mk23
2 files changed, 11 insertions, 18 deletions
diff --git a/manifest.xml b/manifest.xml
index 8448ee9..ac713b3 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -46,7 +46,7 @@
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
- <version>6.0</version>
+ <version>2.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>
@@ -55,7 +55,7 @@
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
- <version>6.0</version>
+ <version>2.0</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
@@ -64,7 +64,7 @@
<hal format="hidl">
<name>android.hardware.soundtrigger</name>
<transport>hwbinder</transport>
- <version>2.3</version>
+ <version>2.0</version>
<interface>
<name>ISoundTriggerHw</name>
<instance>default</instance>
diff --git a/midas.mk b/midas.mk
index e370d32..680dee9 100644
--- a/midas.mk
+++ b/midas.mk
@@ -59,29 +59,22 @@ PRODUCT_PACKAGES += \
# Audio
PRODUCT_PACKAGES += \
- android.hardware.audio@6.0-impl \
- android.hardware.audio@6.0-service \
- android.hardware.audio.effect@6.0-impl \
- android.hardware.audio.effect@6.0-service \
+ android.hardware.audio@2.0-impl \
+ android.hardware.audio@2.0-service \
+ android.hardware.audio.effect@2.0-impl \
+
+# android.hardware.broadcastradio@1.0-impl
+
+$(call inherit-product-if-exists,hardware/android-x86/libaudio/alsa.mk)
# A2DP
PRODUCT_PACKAGES += \
audio.a2dp.default \
android.hardware.bluetooth.a2dp@1.0-impl \
- android.hardware.bluetooth.audio@2.0-impl \
# Sound trigger
PRODUCT_PACKAGES += \
- sound_trigger.stub.default \
-
-PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/audio/audiopolicy/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.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/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
- frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
+ android.hardware.soundtrigger@2.0-impl \
# Copy list of unsupported HW features
PRODUCT_COPY_FILES += \