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

[Jan Holesovsky (via logerrit)]

 android/lib/build.gradle |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

New commits:
commit e322ed191b798fe4c8b7d1432ca68f66d2502937
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Feb 7 12:12:21 2020 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Feb 7 22:44:42 2020 +0100

    android hunspell: Generate lounorc so that we can register bundled extensions.
    
    The dictionaries have to be registered as bundled extensions...
    
    Change-Id: I0ebe04bfa2253d2ed9112055e397797df050eec6
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/88225
    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 3352febb6..776d8af38 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -175,6 +175,7 @@ task createRCfiles {
     def fundamentalrc = file('src/main/assets/program/fundamentalrc')
     def bootstraprc = file('src/main/assets/program/bootstraprc')
     def unorc = file('src/main/assets/program/unorc')
+    def lounorc = file('src/main/assets/program/lounorc')
     def versionrc = file('src/main/assets/program/versionrc')
 
     outputs.files sofficerc, fundamentalrc, unorc, bootstraprc, versionrc
@@ -196,6 +197,13 @@ BRAND_BASE_DIR=file:///assets
 BRAND_SHARE_SUBDIR=share
 CONFIGURATION_LAYERS=xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry
 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}
+BUNDLED_EXTENSIONS_USER=${$ORIGIN/lounorc:BUNDLED_EXTENSIONS_USER}
+SHARED_EXTENSIONS_USER=${$ORIGIN/lounorc:SHARED_EXTENSIONS_USER}
+UNO_SHARED_PACKAGES_CACHE=${$ORIGIN/lounorc:UNO_SHARED_PACKAGES_CACHE}
+TMP_EXTENSIONS=${$ORIGIN/lounorc:TMP_EXTENSIONS}
+UNO_USER_PACKAGES_CACHE=${$ORIGIN/lounorc:UNO_USER_PACKAGES_CACHE}
 '''.stripIndent()
 
         bootstraprc.text = '''\
@@ -210,6 +218,22 @@ UserInstallation=file://$APP_DATA_DIR
 URE_INTERNAL_LIB_DIR=file://$APP_DATA_DIR/lib/
 UNO_TYPES=file://$APP_DATA_DIR/program/udkapi.rdb file://$APP_DATA_DIR/program/offapi.rdb file://$APP_DATA_DIR/program/oovbaapi.rdb
 UNO_SERVICES=file:///assets/program/services.rdb file:///assets/program/services/services.rdb
+'''.stripIndent()
+
+        lounorc.text = '''\
+[Bootstrap]
+PKG_BundledUnoFile=$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
+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_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_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
 '''.stripIndent()
 
         versionrc.text = '''\