From 5f5719e45b3c4e3237a45b019e0fcd86060974a8 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Tue, 8 Mar 2011 15:59:28 -0800
Subject: An HTTP datasource for stagefright using the chromium code.

Use of this new datasource is now the default unless overwritten by

adb shell setprop media.stagefright.use-chromium false

Change-Id: I156a8eb9a1fff1cb537b4aec6cf3e8e6052be81e
---
 media/libstagefright/Android.mk | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'media/libstagefright/Android.mk')

diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 88069e9..2ed3b79 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -19,6 +19,7 @@ LOCAL_SRC_FILES:=                         \
         ESDS.cpp                          \
         FileSource.cpp                    \
         FLACExtractor.cpp                 \
+        HTTPBase.cpp                      \
         HTTPStream.cpp                    \
         JPEGSource.cpp                    \
         MP3Extractor.cpp                  \
@@ -75,7 +76,12 @@ LOCAL_SHARED_LIBRARIES := \
         libdrmframework  \
         libcrypto        \
         libssl           \
-        libgui
+        libgui           \
+        liblog           \
+        libicuuc         \
+        libicui18n       \
+        libz             \
+        libdl            \
 
 LOCAL_STATIC_LIBRARIES := \
         libstagefright_color_conversion \
@@ -100,6 +106,14 @@ LOCAL_STATIC_LIBRARIES := \
         libstagefright_id3 \
         libstagefright_g711dec \
         libFLAC \
+        libstagefright_chromium_http \
+        libchromium_net         \
+        libwebcore              \
+
+ifneq ($(TARGET_SIMULATOR),true)
+LOCAL_SHARED_LIBRARIES += libstlport
+include external/stlport/libstlport.mk
+endif
 
 LOCAL_SHARED_LIBRARIES += \
         libstagefright_amrnb_common \
-- 
cgit v1.1