diff options
| author | Dan Albert <danalbert@google.com> | 2014-05-16 21:47:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-16 21:47:39 +0000 |
| commit | cd0e9ad81ecb2ba4ec92258fdf24f137e74100db (patch) | |
| tree | fbd27e689bf6e2ff95b88d9081bdc5ec43155f3b | |
| parent | 5e2ad74d8dac9d0dd36fe2513aed34f2e3b007d9 (diff) | |
| parent | e33eaba08e30c188d1b9d7aaf6f86327a68e67e1 (diff) | |
| download | external_libcxx-cd0e9ad81ecb2ba4ec92258fdf24f137e74100db.tar.gz external_libcxx-cd0e9ad81ecb2ba4ec92258fdf24f137e74100db.tar.bz2 external_libcxx-cd0e9ad81ecb2ba4ec92258fdf24f137e74100db.zip | |
Merge "libcxxrt moved cxxabi.h from src/ into include/"
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 7e369ca0b..fbce74973 100644 --- a/Android.mk +++ b/Android.mk @@ -58,7 +58,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := libc++ LOCAL_CLANG := true LOCAL_SRC_FILES := $(LIBCXX_SRC_FILES) -LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) -Iexternal/libcxxrt/src -DLIBCXXRT +LOCAL_CPPFLAGS := $(LIBCXX_CPPFLAGS) -Iexternal/libcxxrt/include -DLIBCXXRT LOCAL_RTTI_FLAG := -frtti LOCAL_STATIC_LIBRARIES := libcxxrt LOCAL_SHARED_LIBRARIES := libdl @@ -97,7 +97,7 @@ LOCAL_LDFLAGS += \ -Wl,-force_symbols_weak_list,external/libcxx/lib/weak.exp LOCAL_STATIC_LIBRARIES := libc++abi else -LOCAL_CPPFLAGS += -Iexternal/libcxxrt/src -DLIBCXXRT +LOCAL_CPPFLAGS += -Iexternal/libcxxrt/include -DLIBCXXRT LOCAL_STATIC_LIBRARIES := libcxxrt libunwind LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt LOCAL_LDLIBS += -lrt -lpthread -ldl -lm |