commit daea762e03f303263f320cc02c523c8c591c87c7
author Elliott Hughes <enh@google.com> Fri Jan 31 16:41:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 16:41:14 2014 +0000
tree 5bbdb66884a93047764bd31e25b0b43fa09f290b
parent 6334485f164b3237805c4829c387c549c106779f
parent e5734557d962c801375eeee600e89c98d65dd976

am e5734557: am caefe564: Merge "x86: Enable libunwind"

* commit 'e5734557d962c801375eeee600e89c98d65dd976':
  x86: Enable libunwind

libbacktrace/Android.mk

diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk
index 0ae8839..17a807d 100644
--- a/libbacktrace/Android.mk
+++ b/libbacktrace/Android.mk
@@ -23,7 +23,7 @@
 	liblog \
 
 # To enable using libunwind on each arch, add it to this list.
-libunwind_architectures := arm arm64
+libunwind_architectures := arm arm64 x86
 
 ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),$(libunwind_architectures)))