strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android: change dependency to generate assets

Browse source 
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@gmail.com>
Reviewed-by: Henry Castro <hcastro@collabora.com>
This commit is contained in:
Henry Castro 2020-04-21 18:11:13 -04:00
parent e3b0c05733
commit 40b0e084be
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/build.gradle
View file

@ -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
}

6
loleaflet/Makefile.am
View file

@ -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) \