[Libreoffice-commits] core.git: android/source

[Michael Weghorn (via logerrit)]

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

New commits:
commit 367431b6987b75e7a201499bfbd25a41c92a4a59
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Mar 11 14:48:32 2020 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Mar 11 16:23:59 2020 +0100

    tdf#126909 android: include icons into APK
    
    While default build config for Android Viewer caused
    the zip file(s) containing the icons to be built
    (e.g. 'distro-configs/LibreOfficeAndroid.conf'
    contains '--with-theme=colibre'), icons were not
    included in the APK.
    
    Do so now, which among others also makes page breaks
    shown in Android Viewer (as requested in tdf#126909).
    
    Change-Id: Ie16ff4b483287367b9f892ee614b3e5aa4d31820
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90330
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/android/source/build.gradle b/android/source/build.gradle
index 0ed1659e9081..525782abc606 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -159,6 +159,13 @@ task copyAssets(type: Copy) {
     from("${liboExampleDocument}") {
         rename ".*", "example.odt"
     }
+
+    // include icons
+    into 'assets/share/config'
+    from ("${liboInstdir}/share/config") {
+        includes = ["images_**.zip", ]
+    }
+
     into('program') {
         from "${liboInstdir}/program"
         includes = ['services.rdb', 'services/services.rdb']