android/lib/build.gradle | 6 ++++++
1 file changed, 6 insertions(+)
New commits:
commit 5d74642537a9ae3b49491c6352f2aa959e422d32
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Jul 3 15:25:43 2020 +0200
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Fri Jul 3 16:33:38 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/+/97804
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 8882d8e5d..6177d0ca5 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(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
