summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/Android.mk
diff options
context:
space:
mode:
Diffstat (limited to 'media/libstagefright/Android.mk')
-rw-r--r--media/libstagefright/Android.mk14
1 files changed, 8 insertions, 6 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index ac50470..faa0f31 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:= \
ESDS.cpp \
FileSource.cpp \
FLACExtractor.cpp \
+ FragmentedMP4Extractor.cpp \
HTTPBase.cpp \
JPEGSource.cpp \
MP3Extractor.cpp \
@@ -53,6 +54,8 @@ LOCAL_SRC_FILES:= \
WVMExtractor.cpp \
XINGSeeker.cpp \
avc_utils.cpp \
+ mp4/FragmentedMP4Parser.cpp \
+ mp4/TrackFragment.cpp \
LOCAL_C_INCLUDES:= \
$(TOP)/frameworks/av/include/media/stagefright/timedtext \
@@ -80,6 +83,7 @@ LOCAL_SHARED_LIBRARIES := \
libssl \
libstagefright_omx \
libstagefright_yuv \
+ libsync \
libui \
libutils \
libvorbisidec \
@@ -96,13 +100,9 @@ LOCAL_STATIC_LIBRARIES := \
libstagefright_id3 \
libFLAC \
-ifneq ($(TARGET_BUILD_PDK), true)
-LOCAL_STATIC_LIBRARIES += \
- libstagefright_chromium_http
-LOCAL_SHARED_LIBRARIES += \
- libchromium_net
+LOCAL_SRC_FILES += \
+ chromium_http_stub.cpp
LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1
-endif
LOCAL_SHARED_LIBRARIES += libstlport
include external/stlport/libstlport.mk
@@ -117,6 +117,8 @@ LOCAL_CFLAGS += -Wno-multichar
LOCAL_MODULE:= libstagefright
+LOCAL_MODULE_TAGS := optional
+
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))