From 7469b72e89f3bb1cc6bd78094b9f1c7f50ab168a Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Sat, 1 Feb 2020 21:27:41 +0000
Subject: [PATCH] sm8350-common: Blob out audio HAL extensions

These targets are using prebuilt audio HAL and for some reason,
using the source-built liba2dpoffload breaks A2DP. Just use
prebuilt HAL extensions to avoid mismatches.
Build libtinycompress explicitly as that was built implicitly as
dependency of the audio HAL extensions previously.

Change-Id: I37a5601afdbfdcb81a1053b366fad79fadf4eaa7
---
 BoardConfigCommon.mk | 1 +
 common.mk            | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 4fed68a..0b22117 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -50,6 +50,7 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
 AUDIO_FEATURE_ENABLED_GKI := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
+TARGET_PROVIDES_AUDIO_EXTNS := true
 
 # Audio policy
 USE_CUSTOM_AUDIO_POLICY := 1
diff --git a/common.mk b/common.mk
index ee98064..ef30d7c 100644
--- a/common.mk
+++ b/common.mk
@@ -34,6 +34,7 @@ PRODUCT_PACKAGES += \
     libqcompostprocbundle \
     libqcomvisualizer \
     libqcomvoiceprocessing \
+    libtinycompress \
     libvolumelistener
 
 PRODUCT_PACKAGES += \
@@ -47,13 +48,6 @@ PRODUCT_PACKAGES += \
     android.hardware.audio.service \
     android.hardware.soundtrigger@2.2-impl
 
-PRODUCT_PACKAGES += \
-    liba2dpoffload \
-    libbatterylistener \
-    libhdmiedid \
-    libhfp \
-    libsndmonitor
-
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
     $(LOCAL_PATH)/audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml