[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - android/source

[Christian Lohmaier (via logerrit)]

 android/source/build.gradle |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 7fc17a074b0ad753ff468f2023356cee5e08b13f
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Wed Nov 20 19:32:07 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jan 3 12:31:30 2020 +0100

    android: fixup - the menu file was meant to go to the non-extracted assets
    
    fixup from 93ee955c5359e283e2fe88e45b4c02a60525ed11
    
    Change-Id: I94fa357e982bdf6a74bc182a51fb562ac39c0090
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86167
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 03fe251d6a9b..b32cd3393065 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -149,13 +149,6 @@ task copyUnpackAssets(type: Copy) {
                 )
         }
     }
-    // documents with manual page break trigger attempt to read the ui file
-    // would trigger a css::container::NoSuchElementException with osl_File_E_NOENT
-    // if not present and since it is not caught would crash the app...
-    into('config') {
-        from "${liboInstdir}/share/config"
-        include '**/pagebreakmenu.ui'
-    }
 }
 
 task copyAssets(type: Copy) {
@@ -185,6 +178,13 @@ task copyAssets(type: Copy) {
         // those two get processed by mobile-config.py
         excludes = ['registry/main.xcd', 'registry/res/registry_en-US.xcd']
     }
+    // documents with manual page break trigger attempt to read the ui file
+    // would trigger a css::container::NoSuchElementException with osl_File_E_NOENT
+    // if not present and since it is not caught would crash the app...
+    into('config') {
+        from "${liboInstdir}/share/config"
+        include '**/pagebreakmenu.ui'
+    }
 }
 
 task createFullConfig(type: Copy) {