commit b451069aab57ccfe64c0fc7a18cfc487862fe985
author Dan Albert <danalbert@google.com> Wed Apr 01 17:27:31 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 01 17:27:31 2015 +0000
tree e4bfac752d9937dbce9f0cb9d0ad1c748c23afb9
parent cd33037f559514efe6b51ea1334017ab5a40992f
parent 62a7c02e0efaaf002dcd8864be91a65a0d899e5f

am 62a7c02e: Don\'t bundle the unwinder.

* commit '62a7c02e0efaaf002dcd8864be91a65a0d899e5f':
  Don't bundle the unwinder.

Android.mk

diff --git a/Android.mk b/Android.mk
index e2625d6..a09c322 100644
--- a/Android.mk
+++ b/Android.mk
@@ -85,12 +85,6 @@
 LOCAL_CPPFLAGS_x86_64 := -DLIBCXXABI_USE_LLVM_UNWINDER=0
 LOCAL_CXX_STL := none
 LOCAL_RTTI_FLAG := $(LIBCXXABI_RTTI_FLAG)
-LOCAL_WHOLE_STATIC_LIBRARIES_arm := libunwind_llvm
-LOCAL_WHOLE_STATIC_LIBRARIES_arm64 := libunwindbacktrace
-LOCAL_WHOLE_STATIC_LIBRARIES_mips := libunwindbacktrace
-LOCAL_WHOLE_STATIC_LIBRARIES_mips64 := libunwindbacktrace
-LOCAL_WHOLE_STATIC_LIBRARIES_x86 := libunwindbacktrace
-LOCAL_WHOLE_STATIC_LIBRARIES_x86_64 := libunwindbacktrace
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 # src/Unwind/UnwindRegistersSave.S does not compile.
 LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as