diff options
author | Christopher Ferris <cferris@google.com> | 2013-11-07 19:16:25 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-07 19:16:25 -0800 |
commit | 90e67bcdc383d552dc5325039c86b5bef5429b05 (patch) | |
tree | 20a77fd16bb1f4b7506ae654ddb1a27a5ce5b377 | |
parent | 8ddd08b1f24d361ace9cd78198664db4bf7e1325 (diff) | |
parent | d36bfc30ae5fa86b4c3fd8248e5ee16f479250b6 (diff) | |
download | core-90e67bcdc383d552dc5325039c86b5bef5429b05.tar.gz core-90e67bcdc383d552dc5325039c86b5bef5429b05.tar.bz2 core-90e67bcdc383d552dc5325039c86b5bef5429b05.zip |
am d36bfc30: am e6279294: Merge "Revert "Revert enabling libunwind.""
* commit 'd36bfc30ae5fa86b4c3fd8248e5ee16f479250b6':
Revert "Revert enabling libunwind."
-rw-r--r-- | libbacktrace/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbacktrace/Android.mk b/libbacktrace/Android.mk index 50354d0d6..eb55b47f6 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),)) +ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),arm)) #---------------------------------------------------------------------------- # The native libbacktrace library with libunwind. |