commit 5ff7a02ca497656b711919b81a783e6a10cdcc76
author SathishKumar Mani <smani@codeaurora.org> Fri Sep 14 11:36:35 2012 -0700
committer Iliyan Malchev <malchev@google.com> Fri Sep 14 17:29:31 2012 -0700
tree 1a382801827094e2490d2710d2c9c6214733c7ff
parent d4f2d069126d564b2ef504e0cb59369d8e1e9f32

audio: Remove HAL, UCM dependency on acdb and csd client modules

b/6815609

- acdb and csd client modules are linked into HAL, UCM
  at compile time.
- Remove the compile time dependency by loading the modules at
  runtime.

Change-Id: Iab9684a4564e5dccd8eb6e07017959886d2f57b1
Signed-off-by: Iliyan Malchev <malchev@google.com>

alsa_sound/Android.mk

diff --git a/alsa_sound/Android.mk b/alsa_sound/Android.mk
index 609b7dc..656758c 100644
--- a/alsa_sound/Android.mk
+++ b/alsa_sound/Android.mk
@@ -36,15 +36,19 @@
     libaudiopolicy_legacy \
 
 LOCAL_SHARED_LIBRARIES := \
-    libacdbloader \
     libcutils \
     libutils \
     libmedia \
     libhardware \
     libc        \
     libpower    \
-    libalsa-intf \
-    libcsd-client
+    libalsa-intf
+
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
 
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-alsa
 LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audcal
@@ -140,11 +144,15 @@
     ALSAControl.cpp
 
 LOCAL_SHARED_LIBRARIES := \
-    libacdbloader \
     libcutils \
     liblog    \
-    libalsa-intf \
-    libcsd-client
+    libalsa-intf
+
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
 
 LOCAL_MODULE:= alsa.msm8960
 LOCAL_MODULE_TAGS := optional