commit 68b828e21699d15eed9166cb37b1cc31bbcee884
author Dan Albert <danalbert@google.com> Mon Jul 20 23:23:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 20 23:23:58 2015 +0000
tree 00aaac2dc9a2ef6caf388ae174a05a25cab77fa9
parent 0f0a6b62bf9e06f980d86fbd6afeaad33fef03e5
parent f4ffafb1a3a2d103105650fcd9720aa390360a12

am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary."""

* commit 'f4ffafb1a3a2d103105650fcd9720aa390360a12':
  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 c59cd34..3941edf 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -70,6 +70,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)