commit 6d74870a67258ba49afbd4054f9f4cee18420817
author Ryan Prichard <rprichard@google.com> Wed Mar 31 15:30:30 2021 -0700
committer Ryan Prichard <rprichard@google.com> Wed Mar 31 15:33:35 2021 -0700
tree 329c2b818aa72b5ccf7f0c761261ab7f1878d89b
parent fe5799af6ba8237149966600194e168a1da5dccd

Revert^2 "Switch platform-NDK unwinder to LLVM libunwind.a prebuilt"

This reverts commit 9cd4aff30497ddc2d358e3dbcf9cb09570b2c337.

Bug: http://b/153025717
Test: treehugger
Change-Id: I548ca3dd5bdddb52199b4b5e1455832ee1d28125

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 2c20eed..0d7206f 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -266,10 +266,7 @@
       endif
     endif
 
-    ifneq (,$(filter armeabi armeabi-v7a,$(my_cpu_variant)))
-      my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
-    endif
-
+    my_ndk_stl_static_lib += $(my_libcxx_libdir)/libunwind.a
     my_ldlibs += -ldl
   else # LOCAL_NDK_STL_VARIANT must be none
     # Do nothing.