commit 5e0067b486c3862316aa1f293cf9690c0cf54bda
author Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:16 2011 -0700
committer Jeff Brown <jeffbrown@google.com> Mon Jul 11 22:12:16 2011 -0700
tree 104ac8491b40d6e9d8353322792fb83ce76f4c82
parent 52f556b976a9caceee183d8af2118ddbee02c70a

Remove the simulator target from all makefiles.
Bug: 5010576

Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8

media/libmediaplayerservice/Android.mk

diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index fadad28..ec7d8a0 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -16,10 +16,6 @@
     StagefrightPlayer.cpp       \
     StagefrightRecorder.cpp
 
-ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
-LOCAL_LDLIBS += -ldl -lpthread
-endif
-
 LOCAL_SHARED_LIBRARIES :=     		\
 	libcutils             			\
 	libutils              			\
@@ -32,16 +28,13 @@
 	libstagefright        			\
 	libstagefright_omx    			\
 	libstagefright_foundation       \
-	libgui
+	libgui                          \
+	libdl
 
 LOCAL_STATIC_LIBRARIES := \
         libstagefright_rtsp                     \
         libstagefright_nuplayer                 \
 
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_SHARED_LIBRARIES += libdl
-endif
-
 LOCAL_C_INCLUDES :=                                                 \
 	$(JNI_H_INCLUDE)                                                \
 	$(call include-path-for, graphics corecg)                       \