| commit | ad1961a74736e02ab16d8688ba7f41a687340bdc | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Apr 14 23:17:39 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Apr 14 23:17:41 2015 +0000 |
| tree | 326983444b8673333b48529365df962db4cd32f7 | |
| parent | 2d215e38c02828c1f10ccdb205011025c4172cb6 [diff] | |
| parent | 3e99e662138cc70e211fe67d3c657550f333f81a [diff] |
Merge "Don't use libunwindbacktrace for non-ARM."
diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk index 7961801..da84bdd 100644 --- a/core/cxx_stl_setup.mk +++ b/core/cxx_stl_setup.mk
@@ -68,8 +68,6 @@ 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)