commit 3a3ba057821947e030311a2377f29c7611d9723b
author Marco Nelissen <marcone@google.com> Thu Jul 16 17:25:13 2009 -0700
committer Marco Nelissen <marcone@google.com> Thu Jul 16 17:25:13 2009 -0700
tree 76f0e831104c3694bf4da3600713d7b66852f9ed
parent 7013c8bb9ef94b6016c2b915e8d2369e2475aac6

Another fix for building libstagefright for the simulator, plus whitespace adjustments.

media/libstagefright/Android.mk

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 6e7936c..5944d9c 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -4,29 +4,29 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:=                 \
-	CachingDataSource.cpp     \
+        CachingDataSource.cpp     \
         DataSource.cpp            \
-	FileSource.cpp            \
-	HTTPDataSource.cpp        \
-	HTTPStream.cpp            \
-	MP3Extractor.cpp          \
-	MPEG4Extractor.cpp        \
-	MPEG4Writer.cpp           \
-	MediaBuffer.cpp           \
+        FileSource.cpp            \
+        HTTPDataSource.cpp        \
+        HTTPStream.cpp            \
+        MP3Extractor.cpp          \
+        MPEG4Extractor.cpp        \
+        MPEG4Writer.cpp           \
+        MediaBuffer.cpp           \
         MediaBufferGroup.cpp      \
         MediaExtractor.cpp        \
         MediaPlayerImpl.cpp       \
         MediaSource.cpp           \
-	MetaData.cpp              \
+        MetaData.cpp              \
         MmapSource.cpp            \
         QComHardwareRenderer.cpp  \
-	SampleTable.cpp           \
-	ShoutcastSource.cpp       \
+        SampleTable.cpp           \
+        ShoutcastSource.cpp       \
         SoftwareRenderer.cpp      \
         SurfaceRenderer.cpp       \
         TimeSource.cpp            \
         TimedEventQueue.cpp       \
-	Utils.cpp                 \
+        Utils.cpp                 \
         AudioPlayer.cpp           \
         ESDS.cpp                  \
         OMXClient.cpp             \
@@ -34,16 +34,20 @@
         string.cpp
 
 LOCAL_C_INCLUDES:= \
-	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
+        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
         $(TOP)/external/opencore/android
 
 LOCAL_SHARED_LIBRARIES := \
         libbinder         \
         libmedia          \
-	libutils          \
+        libutils          \
         libcutils         \
         libui
 
+ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
+        LOCAL_LDLIBS += -lpthread
+endif
+
 LOCAL_CFLAGS += -Wno-multichar
 
 LOCAL_PRELINK_MODULE:= false