loleaflet/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 7b97c5b01919dea91309b3143e7a2adde076bf2a Author: Jan Holesovsky <[email protected]> AuthorDate: Fri Nov 8 23:04:47 2019 +0100 Commit: Jan Holesovsky <[email protected]> CommitDate: Fri Nov 8 23:04:47 2019 +0100 android: Update the branding layout. Change-Id: I661dfbda731fb0ef7772364c30b879a19f40a322 diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 5409d9edb..94d6506a3 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -165,8 +165,8 @@ if ENABLE_ANDROIDAPP @rm -rf $(abs_top_srcdir)/android/lib/src/main/assets/dist @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)"/*.svg $(abs_top_srcdir)/android/lib/src/main/assets/dist/images/ ; fi - @if test -d "$(APP_BRANDING_DIR)" ; then cp -a "$(APP_BRANDING_DIR)/toolbar-bg-logo.svg" $(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; 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 @echo @echo "Copied JS, HTML and CSS to the Android project (android/lib/src/main/assets/dist)." @echo _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
