diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:16 -0700 |
| commit | 5e0067b486c3862316aa1f293cf9690c0cf54bda (patch) | |
| tree | 104ac8491b40d6e9d8353322792fb83ce76f4c82 /media/libstagefright/Android.mk | |
| parent | 52f556b976a9caceee183d8af2118ddbee02c70a (diff) | |
| download | frameworks_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/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 8c4b274..7b3b95b 100644 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -159,10 +159,8 @@ LOCAL_STATIC_LIBRARIES += \ libchromium_net \ libwebcore \ -ifneq ($(TARGET_SIMULATOR),true) LOCAL_SHARED_LIBRARIES += libstlport include external/stlport/libstlport.mk -endif LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1 @@ -175,20 +173,7 @@ LOCAL_SHARED_LIBRARIES += \ libstagefright_enc_common \ libstagefright_avc_common \ libstagefright_foundation \ - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) - LOCAL_LDLIBS += -lpthread -ldl - LOCAL_SHARED_LIBRARIES += libdvm - LOCAL_CPPFLAGS += -DANDROID_SIMULATOR -endif - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_SHARED_LIBRARIES += libdl -endif - -ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) - LOCAL_LDLIBS += -lpthread -endif + libdl LOCAL_CFLAGS += -Wno-multichar |