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

[Jan Holesovsky (via logerrit)]

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

New commits:
commit a2f2816b484a722da06bc6d429882fea6b2838b9
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Jul 3 15:25:43 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jul 3 16:34:46 2020 +0200

    android: Always re-do the fonts.conf, to update when the filter changed.
    
    No idea how to add dependency on the build.gradle itself, so at least
    this...
    
    Change-Id: I7d43064d3a2299929b36a3ed3d5c13ada808c898
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97803
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index b4a45fefd..2a6c79f63 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -113,6 +113,12 @@ task copyUnpackAssets(type: Copy) {
     into('etc/fonts') {
         from "${liboSrcRoot}/android/source/"
         includes = ['fonts.conf']
+        doFirst {
+            // we have changed the filter below; so to always re-generate this
+            // file, delete it first - no idea how to set a dependency on
+            // build.gradle changes :-(
+            file('fonts.conf').delete()
+        }
         filter {
             String line ->
                 line.replaceAll(