summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2015-03-03 23:24:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-03 23:24:41 +0000
commitda0677d3172e235acc6a35a5d4fcf2b4dca86fea (patch)
tree45aad452d690d1fae77c8bef10215ee1dedd5aa3
parentdaa873e8e55074d24c9897da2cea6350ee4ad546 (diff)
parent1ab244e7c613a011c03b44b6cbf273998994be68 (diff)
downloadlibcxxabi-da0677d3172e235acc6a35a5d4fcf2b4dca86fea.tar.gz
am 1ab244e7: Don\'t bundle the unwinder for the host library.
* commit '1ab244e7c613a011c03b44b6cbf273998994be68': Don't bundle the unwinder for the host library.
-rw-r--r--Android.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index 68c33bb..a62f6a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -111,8 +111,6 @@ LOCAL_SRC_FILES += $(LLVM_UNWIND_SRC_FILES) src/Unwind/Unwind_AppleExtras.cpp
LOCAL_ASFLAGS += -integrated-as
LOCAL_CFLAGS += -integrated-as
LOCAL_CPPFLAGS += -integrated-as
-else
-LOCAL_WHOLE_STATIC_LIBRARIES := libunwindbacktrace
endif
LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG)