diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-16 21:40:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-16 21:40:59 +0000 |
| commit | 0e477c734f8bd71e5a0ea06169af025823cec24c (patch) | |
| tree | 8c935b129603c3b69f38f6855fe20ca73f6d738f | |
| parent | 550f40fc558e30c0a69b420ac1698832a371efe0 (diff) | |
| parent | 5e2ad74d8dac9d0dd36fe2513aed34f2e3b007d9 (diff) | |
| download | external_libcxx-0e477c734f8bd71e5a0ea06169af025823cec24c.tar.gz external_libcxx-0e477c734f8bd71e5a0ea06169af025823cec24c.tar.bz2 external_libcxx-0e477c734f8bd71e5a0ea06169af025823cec24c.zip | |
am 5e2ad74d: Merge "Fix for libcxx.mk"
* commit '5e2ad74d8dac9d0dd36fe2513aed34f2e3b007d9':
Fix for libcxx.mk
| -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++ |