diff options
| author | Andreas Huber <andih@google.com> | 2011-03-08 15:59:28 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-03-09 10:14:46 -0800 |
| commit | 5f5719e45b3c4e3237a45b019e0fcd86060974a8 (patch) | |
| tree | 6c4d51883cf67312235a4782c47d8962eb3a8152 /media/libstagefright/Android.mk | |
| parent | 82910e7db545c1a133628f06142d8cc6de096d1f (diff) | |
| download | frameworks_base-5f5719e45b3c4e3237a45b019e0fcd86060974a8.zip frameworks_base-5f5719e45b3c4e3237a45b019e0fcd86060974a8.tar.gz frameworks_base-5f5719e45b3c4e3237a45b019e0fcd86060974a8.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/Android.mk')
| -rw-r--r-- | media/libstagefright/Android.mk | 16 |
1 files changed, 15 insertions, 1 deletions
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 \ |