diff options
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/icu4c-android.patch | 11 | ||||
| -rw-r--r-- | icu/makefile.mk | 4 |
2 files changed, 14 insertions, 1 deletions
diff --git a/icu/icu4c-android.patch b/icu/icu4c-android.patch index ad513a2afdf4..2d079a06a4cc 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 95a91a0391c8..bfb40c289eac 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 @@ -190,7 +192,7 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicui18n.a \ $(BUILD_DIR)$/lib$/libicule.a \ $(BUILD_DIR)$/lib$/libicutu.a -.ELIF "$(OS)"=="ANDROID" # The so far normal, non-DISABLE_DYNLOADING case for Android +.ELIF "$(OS)"=="ANDROID" # The no longer normal, non-DISABLE_DYNLOADING case for Android BUILD_ACTION+= && cat uconfig.h.prepend common/unicode/uconfig.h >common/unicode/uconfig.h.new && mv common/unicode/uconfig.h.new common/unicode/uconfig.h OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudatalo.so \ |