commit d283d9348933dabec517db3dfb05596a166901a8
author Elliott Hughes <enh@google.com> Thu Nov 07 09:44:32 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 07 09:44:32 2013 -0800
tree 70608d4bdcf75a3e9988cd7e64bd2839ac940db8
parent 1707bf0320d24ca49118068a9a99a20f5ae5dfad
parent 8ddd08b1f24d361ace9cd78198664db4bf7e1325

am 8ddd08b1: am 4ae94541: am 62ea993a: Merge "Revert enabling libunwind."

* commit '8ddd08b1f24d361ace9cd78198664db4bf7e1325':
  Revert enabling libunwind.

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index eb55b47..50354d0 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -23,7 +23,7 @@
 	liblog \
 
 # To enable using libunwind on each arch, add it to the list below.
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),))
 
 #----------------------------------------------------------------------------
 # The native libbacktrace library with libunwind.