summaryrefslogtreecommitdiff
path: root/i18npool/Module_i18npool.mk
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-11-18 15:22:11 +0100
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2019-11-19 15:20:50 +0100
commitddd2a419c56d8c12b4d10376ecfdde9d87d276e3 (patch)
tree31a52ea97986d46c43e19f012f7b1ea1505047a1 /i18npool/Module_i18npool.mk
parent4ec93b7c71da27c0e986468e1635412a0c67cc00 (diff)
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>
Diffstat (limited to 'i18npool/Module_i18npool.mk')
-rw-r--r--i18npool/Module_i18npool.mk2
1 files changed, 1 insertions, 1 deletions
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 \