Merge "Don't use libunwindbacktrace for non-ARM."

This commit is contained in:
Dan Albert 2015-04-14 23:17:39 +00:00 committed by Gerrit Code Review
commit ad1961a747

View file

@ -68,8 +68,6 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
else else
ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)) ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
my_static_libraries += libunwind_llvm my_static_libraries += libunwind_llvm
else
my_static_libraries += libunwindbacktrace
endif endif
ifeq ($(my_link_type),static) ifeq ($(my_link_type),static)