diff options
| author | Marco Nelissen <marcone@google.com> | 2009-07-16 17:25:13 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2009-07-16 17:25:13 -0700 |
| commit | 72b56ef3d9f164159f58725781b01dd3b052b51a (patch) | |
| tree | 16317f5ef670570da2cf0b590dcb37942a136be1 /media | |
| parent | 361f482fd229c4d0b683d04c93b9da4ab01660b7 (diff) | |
| download | frameworks_av-72b56ef3d9f164159f58725781b01dd3b052b51a.zip frameworks_av-72b56ef3d9f164159f58725781b01dd3b052b51a.tar.gz frameworks_av-72b56ef3d9f164159f58725781b01dd3b052b51a.tar.bz2 | |
Another fix for building libstagefright for the simulator, plus whitespace adjustments.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/Android.mk | 32 |
1 files changed, 18 insertions, 14 deletions
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 @@ LOCAL_PATH:= $(call my-dir) 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 @@ LOCAL_SRC_FILES:= \ 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 |