diff options
| author | Andy McFadden <fadden@android.com> | 2010-07-19 11:27:08 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-19 11:27:08 -0700 |
| commit | 618678e74cc7a013b84d8f5b53d19dd2c5463a85 (patch) | |
| tree | 6aa6a82a61e1b237fbc13e9d5427b536e537887e | |
| parent | bbf6dcd2aa8eb877e6412aaade25a077f62a6284 (diff) | |
| parent | 2c994dbcae12a7515d01c70aa058b0a9ac1e4c20 (diff) | |
| download | frameworks_av-618678e74cc7a013b84d8f5b53d19dd2c5463a85.zip frameworks_av-618678e74cc7a013b84d8f5b53d19dd2c5463a85.tar.gz frameworks_av-618678e74cc7a013b84d8f5b53d19dd2c5463a85.tar.bz2 | |
Merge "Fix sim-eng build."
| -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) |