diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-21 13:51:01 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2014-04-23 15:57:06 -0700 |
| commit | 09437217701ee0d16962250b375698ceece839e8 (patch) | |
| tree | 35700a1cde26dbbbc3388c1b1c803d2baaabaf83 | |
| parent | b21e7e40b9f751f956cdc437b6546c3052d6b604 (diff) | |
| download | libcxxabi_35a-09437217701ee0d16962250b375698ceece839e8.tar.gz | |
Add Apple-specific files for libunwind.
Change-Id: I133910cc56fccb7f6ad094b355261890c53dace5
| -rw-r--r-- | Android.mk | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -54,7 +54,6 @@ LIBCXXABI_RTTI_FLAG := -frtti LIBCXXABI_CPPFLAGS := \ -Iexternal/libcxx/include/ \ -std=c++11 \ - -stdlib=libc++ \ -fexceptions \ include $(CLEAR_VARS) @@ -75,9 +74,24 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libcxxabi LOCAL_CLANG := true + LOCAL_SRC_FILES := $(LIBCXXABI_SRC_FILES) + +ifneq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64)) +LOCAL_SRC_FILES += src/Unwind/UnwindRegistersRestore.S +endif + LOCAL_CFLAGS := $(LIBCXXABI_CFLAGS) LOCAL_CPPFLAGS := $(LIBCXXABI_CPPFLAGS) + +ifeq ($(HOST_OS),darwin) +LOCAL_SRC_FILES += src/Unwind/Unwind_AppleExtras.cpp +# libcxxabi really doesn't like the non-LLVM assembler on Darwin +LOCAL_ASFLAGS += -integrated-as +LOCAL_CFLAGS += -integrated-as +LOCAL_CPPFLAGS += -integrated-as +endif + LOCAL_LDFLAGS := -lpthread LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG) include $(BUILD_HOST_SHARED_LIBRARY) |