From 3f7635f4906c53fa744731efc35235456b7d93bf Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Tue, 26 Aug 2014 15:47:42 -0700 Subject: [PATCH] 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 --- libc/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libc/Android.mk b/libc/Android.mk index 32c9fa6cb..50981718d 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -1070,7 +1070,6 @@ LOCAL_CPPFLAGS := $(libc_common_cppflags) # 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_ADDITIONAL_DEPENDENCIES := $(libc_common_additional_dependencies) 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