diff options
| author | Andreas Huber <andih@google.com> | 2010-06-23 16:40:57 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-06-23 16:40:57 -0700 |
| commit | 608d77b1cf4fb9f63dc861e4e1fa3e80a732f626 (patch) | |
| tree | 924276911b6c7b1cc35951709030559111aabe2c /media/libmediaplayerservice/Android.mk | |
| parent | d255a4e04d06796441ae234e8f3a8277578b3446 (diff) | |
| download | frameworks_av-608d77b1cf4fb9f63dc861e4e1fa3e80a732f626.zip frameworks_av-608d77b1cf4fb9f63dc861e4e1fa3e80a732f626.tar.gz frameworks_av-608d77b1cf4fb9f63dc861e4e1fa3e80a732f626.tar.bz2 | |
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index 3b678cb..8f010c9 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -11,21 +11,11 @@ LOCAL_SRC_FILES:= \ MediaPlayerService.cpp \ MetadataRetrieverClient.cpp \ TestPlayerStub.cpp \ - VorbisPlayer.cpp \ - VorbisMetadataRetriever.cpp \ - MidiMetadataRetriever.cpp \ - MidiFile.cpp - -ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) - -LOCAL_SRC_FILES += \ - StagefrightPlayer.cpp \ + MidiMetadataRetriever.cpp \ + MidiFile.cpp \ + StagefrightPlayer.cpp \ StagefrightRecorder.cpp -LOCAL_CFLAGS += -DBUILD_WITH_FULL_STAGEFRIGHT=1 - -endif - ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true) LOCAL_LDLIBS += -ldl -lpthread endif |