summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxx.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/libcxx.mk b/libcxx.mk
index 1ca8be23a..1cd287385 100644
--- a/libcxx.mk
+++ b/libcxx.mk
@@ -16,13 +16,9 @@
# To use libc++, "include external/libcxx/libcxx.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/libcxx/include \
- bionic \
- bionic/libstdc++/include \
- $(filter-out abi/cpp/include,$(LOCAL_C_INCLUDES))
+ external/libcxxrt/include \
+ $(LOCAL_C_INCLUDES) \
LOCAL_SHARED_LIBRARIES += libc++