Use the default unwind code.
This speeds up the debug malloc code by using the original unwinding code.
The only catch is that it has to link in the libc++ arm unwind code or
there will be crashes when attempting to unwind through libc++ compiled
code.
Bug: 16874447
Change-Id: Ifdbbcbd4137d668b25cf3c2bd59535e06ebfa5a7
diff --git a/libc/Android.mk b/libc/Android.mk
index 32c9fa6..5098171 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -1070,7 +1070,6 @@
# Make sure that unwind.h comes from libunwind.
LOCAL_C_INCLUDES := \
- external/libunwind/include \
$(libc_common_c_includes) \
LOCAL_SRC_FILES := \
@@ -1086,7 +1085,9 @@
LOCAL_SHARED_LIBRARIES := libc libdl
LOCAL_SYSTEM_SHARED_LIBRARIES :=
-LOCAL_WHOLE_STATIC_LIBRARIES := libunwindbacktrace
+# Only need this for arm since libc++ uses its own unwind code that
+# doesn't mix with the other default unwind code.
+LOCAL_STATIC_LIBRARIES_arm := libc++
LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
# Don't install on release build