diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-14 14:21:55 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-05-16 14:27:16 -0700 |
| commit | 1894928715e7182e498208a06fc83a42725e59b8 (patch) | |
| tree | fd48e63221aab9821c7c86c6a5abb2b13a00ac2a | |
| parent | 9fdc63a61cd5c96c733c8e7da3044d00d1eea742 (diff) | |
| download | external_libcxx-1894928715e7182e498208a06fc83a42725e59b8.tar.gz external_libcxx-1894928715e7182e498208a06fc83a42725e59b8.tar.bz2 external_libcxx-1894928715e7182e498208a06fc83a42725e59b8.zip | |
Fix for libcxx.mk
Change-Id: I1b7b4fd2a9109d9025c4602f88e676e3785c8e36
| -rw-r--r-- | libcxx.mk | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -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++ |