[Libreoffice-commits] core.git: android/source i18npool/CustomTarget_breakiterator.mk i18npool/Executable_gendict.mk i18npool/Module_i18npool.mk

[Christian Lohmaier (via logerrit)]

 android/source/build.gradle            |   15 ++++++++++-----
 i18npool/CustomTarget_breakiterator.mk |    2 +-
 i18npool/Executable_gendict.mk         |    2 +-
 i18npool/Module_i18npool.mk            |    2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit ddd2a419c56d8c12b4d10376ecfdde9d87d276e3
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Mon Nov 18 15:22:11 2019 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Nov 19 15:20:50 2019 +0100

    tdf#124536 android: fix breakiterator mismatch (separate data files for zh/ja)
    
    There was a mismatch between the define DICT_JA_ZH_IN_DATAFILE (which
    is effectively set for android as well via DISABLE_DYNLOADING in
    i18npool/Library_i18npool.mk and the makefile rules to actually compile
    the data files and set the DICT_JA_ZH_IN_DATAFILE define in other places
    that were guarded by checks for iOS.
    
    Change-Id: Ia0f117220ab3bad92093a3bf6c613aa9c4812ed4
    Reviewed-on: https://gerrit.libreoffice.org/83102
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index fe7ac2d30afe..5bf49406648e 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -172,11 +172,16 @@ task copyAssets(type: Copy) {
         }
     }
     into('share') {
-        from "${liboInstdir}/share"
-        // Filter data is needed by e.g. the drawingML preset shape import.
-        includes = ['registry/**', 'filter/**']
-        // those two get processed by mobile-config.py
-        excludes = ['registry/main.xcd', 'registry/res/registry_en-US.xcd']
+        from("${liboInstdir}/share") {
+            // Filter data is needed by e.g. the drawingML preset shape import.
+            includes = ['registry/**', 'filter/**']
+            // those two get processed by mobile-config.py
+            excludes = ['registry/main.xcd', 'registry/res/registry_en-US.xcd']
+        }
+        // separate data files for Chinese and Japanese
+        from("${liboWorkdir}/CustomTarget/i18npool/breakiterator/") {
+            include '*.data'
+        }
     }
 }
 
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index 560906ea90aa..862dcebbd3f3 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
 
 i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
 
-ifeq ($(OS),iOS)
+ifneq ($(filter iOS ANDROID,$(OS)),)
 
 $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
 	$(i18npool_BIDIR)/dict_ja.data $(i18npool_BIDIR)/dict_zh.data $(i18npool_BIDIR)/OpenOffice_dat.c
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
index 56d0927085ee..82dd5f7b1e0e 100644
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Executable_use_libraries,gendict,\
 ))
 
 ifeq ($(gb_Side),build)
-ifneq ($(shell grep OS=iOS $(BUILDDIR)/config_host.mk),)
+ifneq ($(shell grep -e OS=iOS -e OS=ANDROID $(BUILDDIR)/config_host.mk),)
 $(eval $(call gb_Executable_add_cxxflags,gendict,\
 	-DDICT_JA_ZH_IN_DATAFILE \
 ))
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 0e1f5e6cef72..47fd1735f366 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,i18npool,\
 	CustomTarget_localedata \
 	CustomTarget_textconversion \
 	Library_collator_data \
-	$(if $(filter-out iOS,$(OS)), \
+	$(if $(filter-out iOS ANDROID,$(OS)), \
 		Library_dict_ja \
 		Library_dict_zh) \
 	Library_i18npool \