From 2c994dbcae12a7515d01c70aa058b0a9ac1e4c20 Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@android.com>
Date: Mon, 19 Jul 2010 10:42:32 -0700
Subject: Fix sim-eng build.

Different handling of libdl.  Added sim handling in one place, corrected
typo in sim handling in another.

Change-Id: I24153ad5b8873083225390ba6a751941d231d092
---
 media/libeffects/lvm/wrapper/Android.mk | 9 +++++++--
 media/libeffects/visualizer/Android.mk  | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'media')

diff --git a/media/libeffects/lvm/wrapper/Android.mk b/media/libeffects/lvm/wrapper/Android.mk
index 4ebc443..aed594d 100644
--- a/media/libeffects/lvm/wrapper/Android.mk
+++ b/media/libeffects/lvm/wrapper/Android.mk
@@ -18,8 +18,13 @@ LOCAL_PRELINK_MODULE := false
 LOCAL_STATIC_LIBRARIES += libmusicbundle
 
 LOCAL_SHARED_LIBRARIES := \
-     libcutils \
-     libdl
+     libcutils
+
+ifeq ($(TARGET_SIMULATOR),true)
+LOCAL_LDLIBS += -ldl
+else
+LOCAL_SHARED_LIBRARIES += libdl
+endif
 
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/Bundle \
diff --git a/media/libeffects/visualizer/Android.mk b/media/libeffects/visualizer/Android.mk
index 82cd925..e6ff654 100644
--- a/media/libeffects/visualizer/Android.mk
+++ b/media/libeffects/visualizer/Android.mk
@@ -15,7 +15,7 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
 LOCAL_MODULE:= libvisualizer
 
 ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldlS
+LOCAL_LDLIBS += -ldl
 endif
 
 ifneq ($(TARGET_SIMULATOR),true)
@@ -27,4 +27,4 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_PRELINK_MODULE := false
 
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file
+include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.1