summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Android.mk
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2009-08-07 09:30:32 -0700
committerAndreas Huber <andih@google.com>2009-08-07 10:40:34 -0700
commit47f59cfe40b0ebb3afd6c39f97dcd1eac2e966f7 (patch)
tree7b4d59814d6e75d323b07ff752de2bb5598f305d /media/libmediaplayerservice/Android.mk
parent23aea9771d800ce43ffd8a23ad64ed6cead4b159 (diff)
downloadframeworks_av-47f59cfe40b0ebb3afd6c39f97dcd1eac2e966f7.zip
frameworks_av-47f59cfe40b0ebb3afd6c39f97dcd1eac2e966f7.tar.gz
frameworks_av-47f59cfe40b0ebb3afd6c39f97dcd1eac2e966f7.tar.bz2
Build the stagefright library by default.
Diffstat (limited to 'media/libmediaplayerservice/Android.mk')
-rw-r--r--media/libmediaplayerservice/Android.mk50
1 files changed, 21 insertions, 29 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk
index f74ef3a..84f858c 100644
--- a/media/libmediaplayerservice/Android.mk
+++ b/media/libmediaplayerservice/Android.mk
@@ -7,49 +7,41 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES:= \
- MediaRecorderClient.cpp \
- MediaPlayerService.cpp \
+ MediaRecorderClient.cpp \
+ MediaPlayerService.cpp \
MetadataRetrieverClient.cpp \
- TestPlayerStub.cpp \
- VorbisPlayer.cpp \
+ StagefrightPlayer.cpp \
+ TestPlayerStub.cpp \
+ VorbisPlayer.cpp \
MidiFile.cpp
ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)
LOCAL_LDLIBS += -ldl -lpthread
endif
-LOCAL_SHARED_LIBRARIES := \
- libcutils \
- libutils \
- libbinder \
- libvorbisidec \
- libsonivox \
- libopencore_player \
- libopencore_author \
- libmedia \
- libandroid_runtime
+LOCAL_SHARED_LIBRARIES := \
+ libcutils \
+ libutils \
+ libbinder \
+ libvorbisidec \
+ libsonivox \
+ libopencore_player \
+ libopencore_author \
+ libmedia \
+ libandroid_runtime \
+ libstagefright \
+ libstagefright_omx
ifneq ($(TARGET_SIMULATOR),true)
LOCAL_SHARED_LIBRARIES += libdl
endif
-LOCAL_C_INCLUDES := external/tremor/Tremor \
- $(call include-path-for, graphics corecg) \
- $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include
+LOCAL_C_INCLUDES := external/tremor/Tremor \
+ $(call include-path-for, graphics corecg) \
+ $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
+ $(TOP)/frameworks/base/media/libstagefright/omx
LOCAL_MODULE:= libmediaplayerservice
-ifeq ($(BUILD_WITH_STAGEFRIGHT),true)
- LOCAL_SRC_FILES += StagefrightPlayer.cpp
-
- LOCAL_SHARED_LIBRARIES += \
- libstagefright \
- libstagefright_omx
-
- LOCAL_C_INCLUDES += $(TOP)/frameworks/base/media/libstagefright/omx
-
- LOCAL_CFLAGS += -DBUILD_WITH_STAGEFRIGHT -DUSE_STAGEFRIGHT
-endif
-
include $(BUILD_SHARED_LIBRARY)