[Libreoffice-commits] online.git: Makefile.am

Jan Holesovsky (via logerrit) logerrit at kemper.freedesktop.org
Wed Jan 8 17:29:33 UTC 2020


 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0cfd90d82922c772ac25d87363e10208ea111af6
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Wed Jan 8 18:21:57 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jan 8 18:29:15 2020 +0100

    android: Fix creating new file from a template.
    
    rm -rf of the assets was newly introduced, done after copying the
    templates to their place.  So missing templates => crash; fixed.
    
    Change-Id: I53d243b4f44c2c38843336e38e603ae0bd4b3c89
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86449
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index 57a666adb..d17bb8d99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ if ENABLE_GTKAPP
 SUBDIRS = gtk loleaflet
 else
 if ENABLE_ANDROIDAPP
-SUBDIRS = android loleaflet
+SUBDIRS = loleaflet android
 else
 SUBDIRS = loleaflet
 endif


More information about the Libreoffice-commits mailing list