diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-29 03:37:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-29 03:37:49 -0700 |
| commit | ad65b46d5f6c569b588556dcf85b64d59600b175 (patch) | |
| tree | c0463f9a7ce1aef11adab697e729386512a73ad0 /media/libstagefright | |
| parent | 6d9a14c08398c58305e831d394280830bb798ee4 (diff) | |
| parent | febf9fbd78d77b6ea1b52f38af7360366d182452 (diff) | |
| download | frameworks_base-ad65b46d5f6c569b588556dcf85b64d59600b175.zip frameworks_base-ad65b46d5f6c569b588556dcf85b64d59600b175.tar.gz frameworks_base-ad65b46d5f6c569b588556dcf85b64d59600b175.tar.bz2 | |
Merge "Part of fix for bug 5065047 build libchromium as a shared lib"
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/Android.mk | 3 |
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 |