diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-19 00:09:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-19 00:09:21 +0000 |
| commit | 8126a33acee99be5d90d84a26d688f3309377dad (patch) | |
| tree | 6067e43ec578242e23488ad381c60a1cb21dd192 | |
| parent | d0388a36b67665be55162388337055ee21a43206 (diff) | |
| parent | 27757ed969c75ac5d6ec2eb6bbea0a12b2d1b700 (diff) | |
| download | stlport-8126a33acee99be5d90d84a26d688f3309377dad.tar.gz | |
am 27757ed9: Merge "Use the build system\'s STL selection."
* commit '27757ed969c75ac5d6ec2eb6bbea0a12b2d1b700':
Use the build system's STL selection.
| -rwxr-xr-x | Android.mk | 3 | ||||
| -rw-r--r-- | libstlport.mk | 15 |
2 files changed, 6 insertions, 12 deletions
@@ -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 |