am 3f7635f4: Use the default unwind code.

* commit '3f7635f4906c53fa744731efc35235456b7d93bf':
  Use the default unwind code.
This commit is contained in:
Christopher Ferris 2014-08-27 04:46:05 +00:00 committed by Android Git Automerger
commit 7bad1a90f1

View File

@ -1082,7 +1082,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 := \
@ -1098,7 +1097,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