commit 4192cce1f252932b6f3cae43e3da7584f4cb2c28
author Eric Laurent <elaurent@google.com> Fri Jul 24 06:58:44 2009 -0700
committer Eric Laurent <elaurent@google.com> Fri Jul 24 06:58:44 2009 -0700
tree bfad0bc2d210f173264701e4a8b1c00db91bcb9d
parent 30b06eb8b98b6e6dc685cf65ad4faa25a85008c5

Fix issue 2001204: libaudiopolicy.so and libaudiopolicygeneric.so libraries must be pre-linked.

libs/audioflinger/Android.mk

diff --git a/libs/audioflinger/Android.mk b/libs/audioflinger/Android.mk
index 7ed6a5f..ec9e332 100644
--- a/libs/audioflinger/Android.mk
+++ b/libs/audioflinger/Android.mk
@@ -54,6 +54,12 @@
     libutils \
     libmedia
 
+ifeq ($(TARGET_SIMULATOR),true)
+ LOCAL_LDLIBS += -ldl
+else
+ LOCAL_SHARED_LIBRARIES += libdl
+endif
+
 LOCAL_MODULE:= libaudiopolicygeneric
 
 ifeq ($(BOARD_HAVE_BLUETOOTH),true)
@@ -64,8 +70,6 @@
   LOCAL_CFLAGS += -DAUDIO_POLICY_TEST
 endif
 
-LOCAL_PRELINK_MODULE := false
-
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -83,7 +87,9 @@
     libutils \
 	libbinder \
     libmedia \
-    libhardware_legacy
+    libhardware_legacy \
+    libaudiopolicygeneric \
+    libaudiopolicy
 
 ifeq ($(strip $(BOARD_USES_GENERIC_AUDIO)),true)
   LOCAL_STATIC_LIBRARIES += libaudiointerface