[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-0' - android/lib

[Jan Holesovsky (via logerrit)]

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

New commits:
commit 8cbdaffe4695276be6754e7fc8e7861711a2955e
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Dec 18 23:14:05 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Dec 19 00:25:53 2019 +0100

    android: The .mo resource (translation) files have to be in 'unpack'.
    
    So that they are copied to the normal filesystem and boost::local can
    pick them up from there.
    
    Change-Id: Ic36288b14023decf9e507b5d7d883849010cd2a7
    Reviewed-on: https://gerrit.libreoffice.org/85445
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 631524dce..997bdfd23 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -74,6 +74,11 @@ task copyUnpackAssets(type: Copy) {
             includes = ["types.rdb"]
             rename 'types.rdb', 'udkapi.rdb'
         }
+
+        into('resource') {
+            from "${liboInstdir}/${liboSharedResFolder}"
+            includes = ['**']
+        }
     }
     into('user/fonts') {
         from "${liboInstdir}/share/fonts/truetype"
@@ -124,11 +129,6 @@ task copyAssets(type: Copy) {
     into('program') {
         from "${liboInstdir}/program"
         includes = ['services.rdb', 'services/services.rdb']
-
-        into('resource') {
-            from "${liboInstdir}/${liboSharedResFolder}"
-            includes = ['*en-US.res']
-        }
     }
     into('share') {
         from "${liboInstdir}/share"