axolotl: Switch to OSS audio HAL
Change-Id: I0437b4fa384cb910474dbe86c852c3c6b4661810
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 59f3193..0b802c9 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -128,14 +128,11 @@
DEXPREOPT_GENERATE_APEX_IMAGE := true
# Audio
-#AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
-#AUDIO_FEATURE_ENABLED_AHAL_EXT := true
AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true
BOARD_SUPPORTS_SOUND_TRIGGER := true
BOARD_USES_ALSA_AUDIO := true
-TARGET_PROVIDES_AUDIO_EXTNS := true
# Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth
diff --git a/device.mk b/device.mk
index e422e4c..aea80cb 100644
--- a/device.mk
+++ b/device.mk
@@ -66,19 +66,24 @@
# Audio
PRODUCT_PACKAGES += \
- android.hardware.audio@2.0.vendor \
- android.hardware.audio@4.0.vendor \
android.hardware.audio@5.0-impl \
- android.hardware.audio.effect@2.0.vendor \
- android.hardware.audio.effect@4.0.vendor \
android.hardware.audio.effect@5.0-impl \
android.hardware.audio.service \
android.hardware.soundtrigger@2.2-impl \
+ audio.primary.sdm845 \
audio.r_submix.default \
audio.usb.default \
+ liba2dpoffload \
+ libbatterylistener \
+ libcomprcapture \
+ libexthwplugin \
+ libhdmiedid \
+ libhfp \
libqcompostprocbundle \
libqcomvisualizer \
libqcomvoiceprocessing \
+ libsndmonitor \
+ libspkrprot \
libtinycompress \
libvolumelistener \
tinymix \
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 4c4dc40..5333fd8 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -49,57 +49,24 @@
vendor/lib64/com.qualcomm.qti.ant@1.0.so
# Audio
-vendor/bin/hw/android.hardware.audio@2.0-service
-vendor/etc/init/android.hardware.audio@2.0-service.rc
-vendor/lib/hw/audio.primary.sdm845.so
vendor/lib/libacdb-fts.so
vendor/lib/libacdbloader.so
vendor/lib/libacdbrtac.so
vendor/lib/libadiertac.so
-vendor/lib/libadm.so
vendor/lib/libaudcal.so
-vendor/lib/libaudio_log_utils.so
-vendor/lib/libaudioalsa.so
-vendor/lib/libaudioconfigstore.so
vendor/lib/libaudioparsers.so
vendor/lib/libcsd-client.so
vendor/lib/libdrc.so
vendor/lib/libqtigef.so
-vendor/lib64/hw/audio.primary.sdm845.so
vendor/lib64/libacdb-fts.so
vendor/lib64/libacdbloader.so
vendor/lib64/libacdbrtac.so
vendor/lib64/libadiertac.so
vendor/lib64/libaudcal.so
-vendor/lib64/libaudio_log_utils.so
-vendor/lib64/libaudioalsa.so
-vendor/lib64/libaudioconfigstore.so
vendor/lib64/libaudioparsers.so
vendor/lib64/libcsd-client.so
vendor/lib64/libqtigef.so
-# Audio - Extensions
-product/lib/vendor.qti.hardware.audiohalext@1.0.so:system_ext/lib/vendor.qti.hardware.audiohalext@1.0.so
-product/lib64/vendor.qti.hardware.audiohalext@1.0.so:system_ext/lib64/vendor.qti.hardware.audiohalext@1.0.so
-vendor/lib/liba2dpoffload.so
-vendor/lib/libbatterylistener.so
-vendor/lib/libcomprcapture.so
-vendor/lib/libexthwplugin.so
-vendor/lib/libhdmiedid.so
-vendor/lib/libhdmipassthru.so
-vendor/lib/libhfp.so
-vendor/lib/libsndmonitor.so
-vendor/lib/libspkrprot.so
-vendor/lib64/liba2dpoffload.so
-vendor/lib64/libbatterylistener.so
-vendor/lib64/libcomprcapture.so
-vendor/lib64/libexthwplugin.so
-vendor/lib64/libhdmiedid.so
-vendor/lib64/libhdmipassthru.so
-vendor/lib64/libhfp.so
-vendor/lib64/libsndmonitor.so
-vendor/lib64/libspkrprot.so
-
# Audio - Firmware
vendor/firmware/tfa98xx.cnt