commit d0dfd00270db0446b9f9d238b96d5c63342bfe2f
author Elliott Hughes <enh@google.com> Thu Jan 02 23:39:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jan 02 23:39:38 2014 +0000
tree 2f490cdedceeaea199e2e7a571afe017d27b7d35
parent cb1f0147d729d1a3e9b4898ea98de3e6761233e4
parent 3e30f6afa042f3bba4822dc5d1ef267ed4b9d722

am 3e30f6af: am 090928b1: am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit '3e30f6afa042f3bba4822dc5d1ef267ed4b9d722':
  Switch ARM back to libcorkscrew temporarily.

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index eb55b47..a6b9c2b 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -22,8 +22,11 @@
 	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.