diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-29 19:28:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-29 19:28:43 +0000 |
| commit | 8b0e1c143340f230e7ac784183862cc3af42233f (patch) | |
| tree | 6ec763ae5b4df6d895fe4ed8edd062cdfc8dc065 | |
| parent | 0131bcc108af8e3c655e098b06be36ffb2934a35 (diff) | |
| parent | 2895d31433128bcefce944e12a16b028cd8ff5c0 (diff) | |
| download | ndk-8b0e1c143340f230e7ac784183862cc3af42233f.tar.gz | |
Merge "Fix --visible-static"
| -rwxr-xr-x | build/tools/build-cxx-stl.sh | 6 |
1 files 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 |