aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2014-06-19 11:03:47 -0700
committerChristopher Ferris <cferris@google.com>2014-06-19 11:07:20 -0700
commitd1ee2b2a4946a073596514462d7629373d22fb27 (patch)
tree89db44c720bb6f10b1852c3821cec82a6cb08b1a
parentc91116188fa1df95e0b83f102d3a113aa87947bc (diff)
downloadlibcxxrt-d1ee2b2a4946a073596514462d7629373d22fb27.tar.gz
Use different unwind library.HEADmastermainl-preview
Bug: 15618209 Change-Id: Iae41b4a2562d446560c0510cb9e0990ed3e35bb0
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index f109e3d..21d2df0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -48,7 +48,7 @@ LOCAL_SRC_FILES := $(LIBCXXRT_SRC_FILES)
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_SRC_FILES := $(LIBCXXRT_SRC_FILES)
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)