From 2895d31433128bcefce944e12a16b028cd8ff5c0 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 14 Jan 2015 14:10:39 -0800
Subject: Fix --visible-static

To apply to both C and C++ code
Needed by https://android-review.googlesource.com/#/c/123330

Change-Id: Ieb61c28d3bc9dbea4ffb90b37d97235715ccd5a8
---
 build/tools/build-cxx-stl.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh
index ca1cb9d1c..eaf6a9ffe 100755
--- a/build/tools/build-cxx-stl.sh
+++ b/build/tools/build-cxx-stl.sh
@@ -494,14 +494,14 @@ HIDDEN_VISIBILITY_FLAGS="-fvisibility=hidden -fvisibility-inlines-hidden"
 # By default, all static libraries include hidden ELF symbols, except
 # if one uses the --visible-static option.
 if [ -z "$VISIBLE_STATIC" ]; then
+    STATIC_CONLYFLAGS="$HIDDEN_VISIBILITY_FLAGS"
     STATIC_CXXFLAGS="$HIDDEN_VISIBILITY_FLAGS"
 else
+    STATIC_CONLYFLAGS=
     STATIC_CXXFLAGS=
 fi
-SHARED_CXXFLAGS=
-# Mainlly deal with android_support.a
-STATIC_CONLYFLAGS="$HIDDEN_VISIBILITY_FLAGS"
 SHARED_CONLYFLAGS="$HIDDEN_VISIBILITY_FLAGS"
+SHARED_CXXFLAGS=
 
 
 # build_stl_libs_for_abi
-- 
cgit v1.2.3