am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit 'a345b25371aa49ebaa4f3b36bb664ba4cf600e60':
  Switch ARM back to libcorkscrew temporarily.
This commit is contained in:
Elliott Hughes 2014-01-02 23:33:33 +00:00 committed by Android Git Automerger
commit 090928b11b

View file

@ -22,8 +22,11 @@ common_shared_libs := \
libgccdemangle \ libgccdemangle \
liblog \ liblog \
# To enable using libunwind on each arch, add it to the list below. # To enable using libunwind on each arch, add it to this list.
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm)) libunwind_architectures :=
#libunwind_architectures := arm
ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures)))
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# The native libbacktrace library with libunwind. # The native libbacktrace library with libunwind.