commit b7831e07cb2da4fcb0de53efc2448e36e6a52139
author Dan Albert <danalbert@google.com> Tue Nov 11 10:58:41 2014 -0800
committer Dan Albert <danalbert@google.com> Tue Nov 11 10:58:41 2014 -0800
tree d841cdb87f161a81ab621ed67be5d83589ddd3a1
parent ce93ad0a42d0d9b191d16005b6614e117608803c

Move the platform libraries to libc++.

Bug: 15193147
Change-Id: I259465ecb5bed5005c717a7e660dc6b28be52c55

Android.mk

diff --git a/Android.mk b/Android.mk
index 36c133c..9761549 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,17 +34,13 @@
     libwebrtc_ns_neon
 endif
 
-LOCAL_STATIC_LIBRARIES := \
-    libprotobuf-cpp-2.3.0-lite
-
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
-    libstlport
+    libprotobuf-cpp-lite \
 
 LOCAL_PRELINK_MODULE := false
 
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)
 
 
@@ -70,11 +66,9 @@
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
     libdl \
-    libstlport
 
 LOCAL_PRELINK_MODULE := false
 
-include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)