commit 2183dcb2e315c652f1a0dd553098e2fbb6715035
author Dan Albert <danalbert@google.com> Wed Jul 22 20:23:12 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 22 20:23:12 2015 +0000
tree 98029d5182227f87ac6c84321e8f76f6f19f8ab3
parent 80ba4a3fb986b9b536c9118aeb59741f7e206110
parent 215959e77d345899fbafa20f765b497b3ac37301

am 215959e7: Revert "Revert "Hide unwinder symbols in each binary.""

* commit '215959e77d345899fbafa20f765b497b3ac37301':
  Revert "Revert "Hide unwinder symbols in each binary.""

core/cxx_stl_setup.mk

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index ce56610..3450b2c 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -68,6 +68,7 @@
     else
         ifeq (arm,$($(my_prefix)$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH))
             my_static_libraries += libunwind_llvm
+            my_ldflags += -Wl,--exclude-libs,libunwind_llvm.a
         endif
 
         ifeq ($(my_link_type),static)