[Libreoffice-commits] online.git: android/lib

[Jan Holesovsky (via logerrit)]

 android/lib/build.gradle |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit c4b068072adaec354a99c51153f583d7747d38ee
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 7 16:06:26 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Feb 7 22:45:21 2020 +0100

    android hunspell: Actually we need the dicts in unpack/.
    
    Otherwise hunspell cannot read them - it needs real files.
    
    Change-Id: Ic90e4e3155dc2eee895527c6a04bb694312f99e4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88226
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 776d8af38..ea92be07f 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -120,8 +120,9 @@ task copyUnpackAssets(type: Copy) {
     }
     into('share') {
         from "${liboInstdir}/share"
+        // extensions - for the dictionaries for hunspell
         // liblangtag data is needed for locales like en-CH
-        includes = ['liblangtag/**']
+        includes = ['extensions/dict-de/**', 'extensions/dict-en/**', 'extensions/dict-es/**', 'extensions/dict-pt-BR/**', 'liblangtag/**']
     }
 }
 
@@ -195,7 +196,7 @@ OSL_SOCKET_PATH=$APP_DATA_DIR/cache
 LO_LIB_DIR=file://$APP_DATA_DIR/lib/
 BRAND_BASE_DIR=file:///assets
 BRAND_SHARE_SUBDIR=share
-CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry
+CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/lounorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/lounorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/lounorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway
 BAK_EXTENSIONS=${$ORIGIN/lounorc:TMP_EXTENSIONS}
 BUNDLED_EXTENSIONS=${$ORIGIN/lounorc:BUNDLED_EXTENSIONS}
@@ -226,11 +227,11 @@ PKG_BundledUnoFile=$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deploymen
 PKG_SharedUnoFile=$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
 PKG_UserUnoFile=$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
 BAK_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bak
-BUNDLED_EXTENSIONS=$BRAND_BASE_DIR/share/extensions
+BUNDLED_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/share/extensions
 BUNDLED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled
 TMP_EXTENSIONS=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/tmp
 SHARED_EXTENSIONS_USER=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/shared
-UNO_SHARED_PACKAGES=$BRAND_BASE_DIR/share/uno_packages
+UNO_SHARED_PACKAGES=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/share/uno_packages
 UNO_SHARED_PACKAGES_CACHE=$UNO_SHARED_PACKAGES/cache
 UNO_USER_PACKAGES=${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/uno_packages
 UNO_USER_PACKAGES_CACHE=$UNO_USER_PACKAGES/cache