From dc30a16ba27c4a0de388696869cd1c518ecb3f3a Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 31 Mar 2015 16:47:09 -0700
Subject: [PATCH] Hide unwinder symbols in each binary.

These symbols need to always be resolved for each binary. Making these
symbols hidden means that we will get a build breakage if this doesn't
happen, and should also prevent the situation where one unwinder's
symbols are visible to the other.

Bug: 18471342
Bug: 19958712
Change-Id: Ieff1f10dab254b60ed120410f45998cf75bb5b9b
---
 core/cxx_stl_setup.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/cxx_stl_setup.mk b/core/cxx_stl_setup.mk
index c59cd34ad8..3941edfa06 100644
--- a/core/cxx_stl_setup.mk
+++ b/core/cxx_stl_setup.mk
@@ -70,6 +70,7 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
     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)