commit e70f95f349c64489e736ad59aac811a5e56deb50
author Christopher Ferris <cferris@google.com> Thu Nov 07 21:30:34 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 07 21:30:34 2013 -0800
tree 63c1355bef175bd7d7211c8111b8ee249b3f72ef
parent d283d9348933dabec517db3dfb05596a166901a8
parent 90e67bcdc383d552dc5325039c86b5bef5429b05

am 90e67bcd: am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""

* commit '90e67bcdc383d552dc5325039c86b5bef5429b05':
  Revert "Revert enabling libunwind."

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 50354d0..eb55b47 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),))
+ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm))
 
 #----------------------------------------------------------------------------
 # The native libbacktrace library with libunwind.