commit d1ee2b2a4946a073596514462d7629373d22fb27
author Christopher Ferris <cferris@google.com> Thu Jun 19 11:03:47 2014 -0700
committer Christopher Ferris <cferris@google.com> Thu Jun 19 11:07:20 2014 -0700
tree 89db44c720bb6f10b1852c3821cec82a6cb08b1a
parent c91116188fa1df95e0b83f102d3a113aa87947bc

Use different unwind library.

Bug: 15618209

Change-Id: Iae41b4a2562d446560c0510cb9e0990ed3e35bb0

Android.mk

diff --git a/Android.mk b/Android.mk
index f109e3d..21d2df0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,7 @@
 LOCAL_CFLAGS := $(LIBCXXRT_CFLAGS)
 LOCAL_CPPFLAGS := $(LIBCXXRT_CPPFLAGS) -DNO_LIBDL
 LOCAL_RTTI_FLAG := $(LIBCXXRT_RTTI_FLAG)
-LOCAL_WHOLE_STATIC_LIBRARIES := libunwind
+LOCAL_WHOLE_STATIC_LIBRARIES := libunwindbacktrace
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_STATIC_LIBRARY)
 
@@ -61,7 +61,7 @@
 LOCAL_CFLAGS := $(LIBCXXRT_CFLAGS)
 LOCAL_CPPFLAGS := $(LIBCXXRT_CPPFLAGS)
 LOCAL_RTTI_FLAG := $(LIBCXXRT_RTTI_FLAG)
-LOCAL_WHOLE_STATIC_LIBRARIES := libunwind
+LOCAL_WHOLE_STATIC_LIBRARIES := libunwindbacktrace
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_MULTILIB := both
 include $(BUILD_HOST_STATIC_LIBRARY)