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

* commit '1fa6d5b0a3fc873bce4d16056c115bf30e62a147':
  Don't use libunwindbacktrace for non-ARM.
This commit is contained in:
Dan Albert 2015-04-14 23:56:11 +00:00 committed by Android Git Automerger
commit cbdd2c348f

View file

@ -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)