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

* commit 'dfc48139c9afc8366184a1a7bc2f3762c0c82ea2':
  Switch ARM back to libcorkscrew temporarily.
This commit is contained in:
Elliott Hughes 2014-01-02 15:31:13 -08:00 committed by Android Git Automerger
commit a345b25371
1 changed files with 5 additions and 2 deletions

View File

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