summaryrefslogtreecommitdiffstats
path: root/media/libmedia/Android.mk
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-07-11 22:12:16 -0700
committerJeff Brown <jeffbrown@google.com>2011-07-11 22:12:16 -0700
commit5e0067b486c3862316aa1f293cf9690c0cf54bda (patch)
tree104ac8491b40d6e9d8353322792fb83ce76f4c82 /media/libmedia/Android.mk
parent52f556b976a9caceee183d8af2118ddbee02c70a (diff)
downloadframeworks_av-5e0067b486c3862316aa1f293cf9690c0cf54bda.zip
frameworks_av-5e0067b486c3862316aa1f293cf9690c0cf54bda.tar.gz
frameworks_av-5e0067b486c3862316aa1f293cf9690c0cf54bda.tar.bz2
Remove the simulator target from all makefiles.
Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
Diffstat (limited to 'media/libmedia/Android.mk')
-rw-r--r--media/libmedia/Android.mk10
1 files changed, 1 insertions, 9 deletions
diff --git a/media/libmedia/Android.mk b/media/libmedia/Android.mk
index f7c54fa..7af4a87 100644
--- a/media/libmedia/Android.mk
+++ b/media/libmedia/Android.mk
@@ -49,20 +49,12 @@ LOCAL_SRC_FILES:= \
LOCAL_SHARED_LIBRARIES := \
libui libcutils libutils libbinder libsonivox libicuuc libexpat \
libcamera_client libstagefright_foundation \
- libgui
+ libgui libdl
LOCAL_WHOLE_STATIC_LIBRARY := libmedia_helper
LOCAL_MODULE:= libmedia
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \
$(call include-path-for, graphics corecg) \