[Libreoffice-commits] .: icu/icu4c-android.patch icu/makefile.mk

[Libreoffice Gerrit user]

 icu/icu4c-android.patch |   11 +++++++++++
 icu/makefile.mk         |    2 ++
 2 files changed, 13 insertions(+)

New commits:
commit cee6c4b193eff4f499e60867766c13fda3818239
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Nov 11 09:15:14 2012 +0200

    Use hidden visibility now for Android with icu built statically
    
    Change-Id: I46b97d31f8aac046479d030c988413017c5b940a

diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch
index ad513a2..2d079a0 100644
--- a/icu/icu4c-android.patch
+++ b/icu/icu4c-android.patch
@@ -61,3 +61,14 @@
  #elif U_PLATFORM_IS_LINUX_BASED
  #   define U_TIMEZONE __timezone
  #elif U_PLATFORM_USES_ONLY_WIN32_API
+--- misc/icu/source/common/unicode/platform.h
++++ misc/build/icu/source/common/unicode/platform.h
+@@ -641,7 +641,7 @@
+ #elif defined(U_STATIC_IMPLEMENTATION)
+ #   define U_EXPORT
+ #elif defined(__GNUC__)
+-#   define U_EXPORT __attribute__((visibility("default")))
++#   define U_EXPORT
+ #elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \
+    || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) 
+ #   define U_EXPORT __global
diff --git a/icu/makefile.mk b/icu/makefile.mk
index e5f8f57..bfb40c2 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -64,6 +64,8 @@ PATCH_FILES=\
 .IF "$(OS)"=="ANDROID"
 PATCH_FILES+=\
     icu4c-android.patch
+icu_CFLAGS+=-fvisibility=hidden
+icu_CXXFLAGS+=-fvisibility=hidden
 .ELSE
 PATCH_FILES+=\
     icu4c-rpath.patch