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@googlemail.com>

1 files changed, 10 insertions, 5 deletions

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'
+        }
     }
 }