summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-07-22 14:19:36 +0100
committerKristian Monsen <kristianm@google.com>2011-07-25 11:22:58 +0100
commitfebf9fbd78d77b6ea1b52f38af7360366d182452 (patch)
tree1436aa10f11f634baca4feb14ea33ae43e3ec048 /media
parent142d7575b52d03d46246e3b142e22ebc32d45a84 (diff)
downloadframeworks_base-febf9fbd78d77b6ea1b52f38af7360366d182452.zip
frameworks_base-febf9fbd78d77b6ea1b52f38af7360366d182452.tar.gz
frameworks_base-febf9fbd78d77b6ea1b52f38af7360366d182452.tar.bz2
Part of fix for bug 5065047 build libchromium as a shared lib
Building chromium as a shared lib, updating other libs that use it. Change-Id: Ia20749bb7fbec51b94adb314116503f62f41b782
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/Android.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 3a3c082..3f4dace 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -132,10 +132,9 @@ LOCAL_SHARED_LIBRARIES += \
LOCAL_STATIC_LIBRARIES += \
libstagefright_chromium_http \
- libchromium_net \
libwebcore \
-LOCAL_SHARED_LIBRARIES += libstlport
+LOCAL_SHARED_LIBRARIES += libstlport libchromium_net
include external/stlport/libstlport.mk
LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1