diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:15:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:15:07 -0700 |
| commit | 63b96e48deb0a4c5b594693922bd9101ffc3ef93 (patch) | |
| tree | f4e64e5c62746d337a1b1de063a57c50c9fa3b62 /media/libmediaplayerservice/Android.mk | |
| parent | a5a0cea84cdf116f4de4f812c26be73e70a260e6 (diff) | |
| parent | 5e0067b486c3862316aa1f293cf9690c0cf54bda (diff) | |
| download | frameworks_av-63b96e48deb0a4c5b594693922bd9101ffc3ef93.zip frameworks_av-63b96e48deb0a4c5b594693922bd9101ffc3ef93.tar.gz frameworks_av-63b96e48deb0a4c5b594693922bd9101ffc3ef93.tar.bz2 | |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 11 |
1 files changed, 2 insertions, 9 deletions
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 @@ LOCAL_SRC_FILES:= \ 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 @@ LOCAL_SHARED_LIBRARIES := \ 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) \ |