From 4cb2ade36a3f7483a9edc3b7788fb8b5ab749ece Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 15 Sep 2014 12:54:26 -0700 Subject: Use the build system's STL selection. This file is only kept around for compatibility so the change won't have to go in as one mega-CL. Change-Id: If712ba0ae7908d8147a69e29da5c453a183d6540 --- Android.mk | 3 +++ libstlport.mk | 15 +++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Android.mk b/Android.mk index 7a2f2ec..7b6b6f6 100755 --- a/Android.mk +++ b/Android.mk @@ -53,6 +53,8 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 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 -- cgit v1.2.3