summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-11-07 09:01:20 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-07 09:01:20 -0800
commit4ae94541b82dde787b0e2c46f1a4f2524572c1c4 (patch)
treee99c8c3f84ab0f206829b12665c4bb1304542bf5
parentfde641ee24b7a0a5d1fb6e2532153f1bb8504aea (diff)
parent62ea993a6997701dba7735ca4a4af6fc6cabac2c (diff)
downloadsystem_core-4ae94541b82dde787b0e2c46f1a4f2524572c1c4.zip
system_core-4ae94541b82dde787b0e2c46f1a4f2524572c1c4.tar.gz
system_core-4ae94541b82dde787b0e2c46f1a4f2524572c1c4.tar.bz2
am 62ea993a: Merge "Revert enabling libunwind."
* commit '62ea993a6997701dba7735ca4a4af6fc6cabac2c': Revert enabling libunwind.
-rw-r--r--libbacktrace/Android.mk2
1 files changed, 1 insertions, 1 deletions
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 @@ common_shared_libs := \
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.