commit b019e8148d36fd756fbc1410cf04f53ce4e537db
author Linux Build Service Account <lnxbuild@localhost> Fri Jan 18 22:29:44 2019 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jan 18 22:29:44 2019 -0800
tree e311114622efd35019931f30f8b1220f3341d06a
parent 04116ecfd53984b14303111025d0944642959c3b
parent 58a4e26dcc1ac1936b9e766a99af5eeea4f7ee85

Merge "msmsteppe: Update the ACDB ID."

configs/msmnile_au/msmnile_au.mk

diff --git a/configs/msmnile_au/msmnile_au.mk b/configs/msmnile_au/msmnile_au.mk
index 7abac58..f2d9ce9 100644
--- a/configs/msmnile_au/msmnile_au.mk
+++ b/configs/msmnile_au/msmnile_au.mk
@@ -2,7 +2,6 @@
 #
 #AUDIO_FEATURE_FLAGS
 BOARD_USES_ALSA_AUDIO := true
-TARGET_USES_AOSP_FOR_AUDIO := false
 
 ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
 USE_CUSTOM_AUDIO_POLICY := 1

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index c1bf398..ba9f2b3 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -321,12 +321,17 @@
 	liblog \
 	libcutils \
 	libtinyalsa \
-	libtinycompress_vendor \
 	libaudioroute \
 	libdl \
 	libaudioutils \
 	libexpat
 
+ifneq ($(strip $(TARGET_USES_AOSP_FOR_AUDIO)),true)
+    LOCAL_SHARED_LIBRARIES += libtinycompress_vendor
+else
+    LOCAL_SHARED_LIBRARIES += libtinycompress
+endif
+
 LOCAL_C_INCLUDES += \
 	external/tinyalsa/include \
 	external/tinycompress/include \