commit dfc48139c9afc8366184a1a7bc2f3762c0c82ea2
author Elliott Hughes <enh@google.com> Thu Jan 02 23:26:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 02 23:26:51 2014 +0000
tree 05ed7f1763c7a5a6ff9d32d6b213bb0993111cff
parent 5b8abdf6278a4142736d918d1371d10c54c91db3
parent 3c67fe903913d354c9570fd1e662c9a3d8bedbd9

Merge "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.