From 686a5576890b3d5ea48ddc9da52b0c8aca75f876 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 23 Jun 2015 13:32:30 -0700
Subject: [PATCH] Revert "Revert "Hide unwinder symbols in each binary.""

Bug: 18471342
Bug: 19958712
This reverts commit 61f675bb53f31fb2500fc135603ca7a5f7620d8e.

Change-Id: I87d3655d1238a9cf26d96dcb0665ba5110931800
---
 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)