Merge "Clean up redundant links to stlport."
diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk
index 3619821..e3fd420 100644
--- a/media/libstagefright/Android.mk
+++ b/media/libstagefright/Android.mk
@@ -108,7 +108,6 @@
         chromium_http_stub.cpp
 LOCAL_CPPFLAGS += -DCHROMIUM_AVAILABLE=1
 
-LOCAL_SHARED_LIBRARIES += libstlport
 include external/stlport/libstlport.mk
 
 LOCAL_SHARED_LIBRARIES += \
diff --git a/media/libstagefright/chromium_http/Android.mk b/media/libstagefright/chromium_http/Android.mk
index 109e3fe..1a40275 100644
--- a/media/libstagefright/chromium_http/Android.mk
+++ b/media/libstagefright/chromium_http/Android.mk
@@ -19,7 +19,6 @@
 
 LOCAL_SHARED_LIBRARIES += \
         libbinder \
-        libstlport \
         libchromium_net \
         libutils \
         libbinder \