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

[Jan Holesovsky (via logerrit)]

 loleaflet/Makefile.am |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 37b5d29fc139ded20e89535c54218b50c2c87312
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Jan 3 11:03:32 2020 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri Jan 3 11:07:54 2020 +0100

    android: Copy the online widget theme too if available.
    
    Change-Id: If9fd23e24bd28897f1645c043678b44f86d5b2e4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86163
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index 410e7453e..30ed1741d 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -160,12 +160,14 @@ build-loleaflet: | $(LOLEAFLET_L10N_DST) \
 	$(builddir)/dist/loleaflet.html
 	@echo "build loleaflet completed"
 if ENABLE_ANDROIDAPP
-	@rm -rf $(abs_top_srcdir)/android/lib/src/main/assets/dist
+	@rm -rf $(abs_top_srcdir)/android/lib/src/main/assets
+	@mkdir -p $(abs_top_srcdir)/android/lib/src/main/assets
 	@cp -a $(builddir)/dist $(abs_top_srcdir)/android/lib/src/main/assets/
 	@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js" $(abs_top_srcdir)/android/lib/src/main/assets/dist/ ; else touch $(abs_top_srcdir)/android/lib/src/main/assets/dist/branding.css ; fi
 	@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)"/images/*.svg $(abs_top_srcdir)/android/lib/src/main/assets/dist/images/ ; fi
 	@if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg" $(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; fi
 	@if test -d "$(APP_BRANDING_DIR)/android" ; then for I in `cd "$(APP_BRANDING_DIR)/android" && find . -type f` ; do mkdir -p $(abs_top_srcdir)/android/lib/src/main/res/`dirname $$I` ; cp -a "$(APP_BRANDING_DIR)/android/$$I" "$(abs_top_srcdir)/android/app/src/main/res/$$I" ; done ; fi
+	@if test -d "$(APP_BRANDING_DIR)/online-theme" ; then mkdir -p $(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions ; cp -a "$(APP_BRANDING_DIR)/online-theme" "$(abs_top_srcdir)/android/lib/src/main/assets/share/theme_definitions/online" ; fi
 	@touch "$(abs_top_srcdir)/android/app/src/main/res/drawable/ic_launcher_brand.xml" # to avoid problems with a missing resource in the non-branded builds
 	@echo
 	@echo "Copied JS, HTML and CSS to the Android project (android/lib/src/main/assets/dist)."