[Libreoffice-commits] core.git: external/icu

[Libreoffice Gerrit user]

 external/icu/ExternalProject_icu.mk |    2 +-
 external/icu/icu4c-android.patch.1  |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 03e0d86fe221ee3d8a8595fcd4ccf682101255f1
Author:     Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Fri Aug 3 09:27:12 2018 +0200
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Fri Aug 3 11:56:57 2018 +0200

    icu: fix Android build
    
    Change-Id: I9c2f508098610ff97f059bb325401de052a35e3c
    Reviewed-on: https://gerrit.libreoffice.org/58549
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins

diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index 1e94eef0fd5e..d4a3e9e7a9cb 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -49,7 +49,7 @@ icu_CXXFLAGS:="$(CXXFLAGS) $(CXXFLAGS_CXX11) \
 	$(if $(filter GCC,$(COM)),-fno-strict-aliasing) \
 	$(if $(filter $(true),$(gb_SYMBOL)),$(gb_DEBUGINFO_FLAGS)) \
 	$(if $(filter FUZZERS,$(BUILD_TYPE)),-DU_USE_STRTOD_L=0) \
-	$(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer)"
+	$(if $(filter ANDROID,$(OS)),-fvisibility=hidden -fno-omit-frame-pointer $(SOLARINC))"
 icu_LDFLAGS:=" \
 	$(if $(ENABLE_LTO),$(gb_LTOFLAGS)) \
 	$(if $(filter TRUE,$(HAVE_LD_HASH_STYLE)),-Wl$(COMMA)--hash-style=$(WITH_LINKER_HASH_STYLE)) \
diff --git a/external/icu/icu4c-android.patch.1 b/external/icu/icu4c-android.patch.1
index 9c87a436055c..1f1fdcff2fb9 100644
--- a/external/icu/icu4c-android.patch.1
+++ b/external/icu/icu4c-android.patch.1
@@ -68,3 +68,19 @@ diff -ur icu.org/source/i18n/number_decimalquantity.cpp icu/source/i18n/number_d
      if (result != 0) {
          _setToLong(result);
          scale -= fracLength;
+--- icu/source/i18n/decimfmt.cpp.orig	2018-08-03 09:26:22.036924562 +0200
++++ icu/source/i18n/decimfmt.cpp	2018-08-03 09:25:14.169399374 +0200
+@@ -9,6 +9,13 @@
+ // Helpful in toString methods and elsewhere.
+ #define UNISTR_FROM_STRING_EXPLICIT
+ 
++#ifdef __ANDROID__
++#ifndef ARM
++#define ARM
++#endif
++#include <android/compatibility.hxx>
++#endif
++
+ #include <cmath>
+ #include <cstdlib>
+ #include <stdlib.h>