diff options
| author | Dan Albert <danalbert@google.com> | 2015-09-24 21:43:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 21:43:52 +0000 |
| commit | 2743b909488d24f0c57f688d5ee5a759c2a4cf1a (patch) | |
| tree | f0b7cc9d29d8c9aa15e4fc67331fbe1d6412b8ff | |
| parent | 434d6469d8f6f2465c6b0d8910589148eecbf9d3 (diff) | |
| parent | 8b90ac3b73e48894c4b7547ee4a04deff0ccc595 (diff) | |
| download | libcxxabi-brillo-m7-dev.tar.gz | |
am 8b90ac3b: Cleanup Android.mk.brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
* commit '8b90ac3b73e48894c4b7547ee4a04deff0ccc595':
Cleanup Android.mk.
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -40,7 +40,6 @@ LIBCXXABI_SRC_FILES := \ LIBCXXABI_INCLUDES := \ $(LOCAL_PATH)/include \ external/libcxx/include \ - external/libunwind_llvm/include \ LIBCXXABI_RTTI_FLAG := -frtti LIBCXXABI_CPPFLAGS := \ @@ -56,6 +55,8 @@ LOCAL_MODULE := libc++abi LOCAL_CLANG := true LOCAL_SRC_FILES := $(LIBCXXABI_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXXABI_INCLUDES) +LOCAL_C_INCLUDES_arm := external/libunwind_llvm/include +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CPPFLAGS := $(LIBCXXABI_CPPFLAGS) -DHAVE___CXA_THREAD_ATEXIT_IMPL LOCAL_CPPFLAGS_arm := -DLIBCXXABI_USE_LLVM_UNWINDER=1 LOCAL_CPPFLAGS_arm64 := -DLIBCXXABI_USE_LLVM_UNWINDER=0 @@ -81,6 +82,7 @@ LOCAL_MODULE := libc++abi LOCAL_CLANG := true LOCAL_SRC_FILES := $(LIBCXXABI_SRC_FILES) LOCAL_C_INCLUDES := $(LIBCXXABI_INCLUDES) +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_CPPFLAGS := $(LIBCXXABI_CPPFLAGS) LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG) LOCAL_MULTILIB := both |