Merge "Use the build system's STL selection."
diff --git a/Android.mk b/Android.mk
index 7a2f2ec..7b6b6f6 100755
--- a/Android.mk
+++ b/Android.mk
@@ -53,6 +53,8 @@
LOCAL_CFLAGS := $(libstlport_cflags)
LOCAL_CPPFLAGS := $(libstlport_cppflags)
LOCAL_C_INCLUDES := $(libstlport_c_includes)
+LOCAL_CXX_STL := none
+LOCAL_SHARED_LIBRARIES := libstdc++
include $(BUILD_SHARED_LIBRARY)
##########################################
@@ -66,4 +68,5 @@
LOCAL_CFLAGS := $(libstlport_cflags)
LOCAL_CPPFLAGS := $(libstlport_cppflags)
LOCAL_C_INCLUDES := $(libstlport_c_includes)
+LOCAL_CXX_STL := none
include $(BUILD_STATIC_LIBRARY)
diff --git a/libstlport.mk b/libstlport.mk
index b4d34f6..799ed6f 100644
--- a/libstlport.mk
+++ b/libstlport.mk
@@ -1,12 +1,3 @@
-# To use stlport, "include external/stlport/libstlport.mk" in your target.
-
-# We put the STL libraries in front of any user libraries, but we need to
-# keep the RTTI stuff in abi/cpp/include in front of our STL headers.
-LOCAL_C_INCLUDES := \
- $(filter abi/cpp/include,$(LOCAL_C_INCLUDES)) \
- external/stlport/stlport \
- bionic \
- bionic/libstdc++/include \
- $(filter-out abi/cpp/include,$(LOCAL_C_INCLUDES))
-
-LOCAL_SHARED_LIBRARIES += libstlport
+# New projects shouldn't use this file. To use libc++, add the following line to
+# your makefile.
+LOCAL_CXX_STL := stlport
