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

[Henry Castro (via logerrit)]

 android/app/build.gradle |    6 ++++--
 loleaflet/Makefile.am    |    6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 40b0e084beaa98df54263de0465d02f6b6e5f0f2
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Apr 21 18:11:13 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed Apr 22 00:49:43 2020 +0200

    android: change dependency to generate assets
    
    According to gradle graph tasks, add a dependecy
    to generate loleaflet assets
    
    Change-Id: I5b528989c645903840eae44b7770b7d2425bb921
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92662
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/android/app/build.gradle b/android/app/build.gradle
index ab9944d89..9d45689bb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -79,7 +79,7 @@ task copyBrandFiles(type: Copy) {
 	into "src/main/res"
 }
 
-task build_loleaflet(type: Exec) {
+task generateLoleafletAssets(type: Exec) {
 	commandLine 'make', '-C', '../../'
 }
 
@@ -88,5 +88,7 @@ afterEvaluate {
 		copyBrandFiles.enabled = false
 	}
 
-	preBuild.dependsOn copyBrandFiles, build_loleaflet
+	preBuild.dependsOn copyBrandFiles
+	generateDebugAssets.dependsOn generateLoleafletAssets
+	generateReleaseAssets.dependsOn generateLoleafletAssets
 }
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ceb3419d7..d38c7953a 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -339,11 +339,7 @@ if ENABLE_ANDROIDAPP
 	@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
-	@echo "  Now you need to build the actual .apk from Android Studio:"
-	@echo "  Just open the 'android' subdir as a project there and build."
-	@echo
+	@echo "JS, HTML and CSS has been updated (android/lib/src/main/assets/dist)."
 endif
 
 $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \