am 1fa6d5b0: am 612581e8: am ad1961a7: Merge "Don\'t use libunwindbacktrace for non-ARM."

* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147': Don't use libunwindbacktrace for non-ARM.
2015-04-14 23:56:11 +00:00
parent c2ac7201a7 1fa6d5b0a3
commit cbdd2c348f
1 changed files with 0 additions and 2 deletions
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -68,8 +68,6 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
    else
        ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
            my_static_libraries += libunwind_llvm
-        else
-            my_static_libraries += libunwindbacktrace
        endif

        ifeq ($(my_link_type),static)