diff options
author | Andy McFadden <fadden@android.com> | 2010-07-19 10:42:32 -0700 |
---|---|---|
committer | Andy McFadden <fadden@android.com> | 2010-07-19 10:53:30 -0700 |
commit | d84f9863afe1401c65de0b863c7a6243bd433166 (patch) | |
tree | f02726df62de0d086d50cee49b671f548fe5d379 | |
parent | b5b37f3bcc3065959c27e588f065dfb33a061e1d (diff) | |
download | frameworks_base-d84f9863afe1401c65de0b863c7a6243bd433166.zip frameworks_base-d84f9863afe1401c65de0b863c7a6243bd433166.tar.gz frameworks_base-d84f9863afe1401c65de0b863c7a6243bd433166.tar.bz2 |
Fix sim-eng build.
Different handling of libdl. Added sim handling in one place, corrected
typo in sim handling in another.
Change-Id: I24153ad5b8873083225390ba6a751941d231d092
-rw-r--r-- | media/libeffects/lvm/wrapper/Android.mk | 9 | ||||
-rw-r--r-- | media/libeffects/visualizer/Android.mk | 4 |
2 files changed, 9 insertions, 4 deletions
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) |