From 8b90ac3b73e48894c4b7547ee4a04deff0ccc595 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Thu, 24 Sep 2015 14:05:04 -0700 Subject: Cleanup Android.mk. Export our includes and fix the unwind include path to be for only arm. Change-Id: Ic91bffae2fa53a93b449764fe76c2f5cf92cccaf --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index b014858..38362c1 100644 --- a/Android.mk +++ b/Android.mk @@ -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 -- cgit v1.2.3