summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-08-17 02:41:00 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-17 02:41:00 -0700
commit8a976a863cf921f97feff8be63f11775a1d8b76f (patch)
treeb3f53684b537c6e7adbd93a0766f04da2bb36f13 /media
parent61659f61b8dec729ffc03ef88e2d87f8941dcfc0 (diff)
parent421b31b7a859b6aa6185a36143158ef59f751adf (diff)
downloadframeworks_av-8a976a863cf921f97feff8be63f11775a1d8b76f.zip
frameworks_av-8a976a863cf921f97feff8be63f11775a1d8b76f.tar.gz
frameworks_av-8a976a863cf921f97feff8be63f11775a1d8b76f.tar.bz2
Merge "Testing for bug 5122864 libwebcore related libraries increased by 3MB in ICS vs HCMR2"
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/Android.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index b9e4f9f..0b1a2af 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -131,11 +131,9 @@ LOCAL_SHARED_LIBRARIES += \
libdl \
LOCAL_STATIC_LIBRARIES += \
- libstagefright_chromium_http \
- libwebcore \
- libchromium_net \
+ libstagefright_chromium_http
-LOCAL_SHARED_LIBRARIES += libstlport
+LOCAL_SHARED_LIBRARIES += libstlport libchromium_net
include external/stlport/libstlport.mk
LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1