commit 3e99e662138cc70e211fe67d3c657550f333f81a
author Dan Albert <danalbert@google.com> Tue Apr 14 14:42:45 2015 -0700
committer Dan Albert <danalbert@google.com> Tue Apr 14 14:42:45 2015 -0700
tree 8f92a812dd1e66d28c9e2768924286808e8a2402
parent f37e96e232f7ac3d618526aafcd69705ac7bb3a4

Don't use libunwindbacktrace for non-ARM.

After fixing the link order here, it seems libunwindbacktrace no
longer works for exception unwinding, but libgcc now does.

Change-Id: Ice79af4b8f234ed6a053ee818b6dec3aa9706c8a

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index 7961801..da84bdd 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -68,8 +68,6 @@
     else
         ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
             my_static_libraries += libunwind_llvm
-        else
-            my_static_libraries += libunwindbacktrace
         endif
 
         ifeq ($(my_link_type),static)