android/lib/build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8f394bdd548f27972fd264b793487e9cc9605542
Author: Henry Castro <hcas...@collabora.com>
AuthorDate: Tue Aug 11 17:37:34 2020 -0400
Commit: Henry Castro <hcas...@collabora.com>
CommitDate: Wed Aug 12 14:49:44 2020 +0200
android: fix build loleaflet assets
By default it is generated by automake,
but if someone wants to change manually,
do not forget to adjust this directory too.
Change-Id: I17e36364ac467d889e876be2995ef08e3c06da9e
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100569
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 90fb964f5..bffb8d0db 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -296,11 +296,11 @@ preBuild.dependsOn 'createRCfiles',
'copyBrandTheme'
task generateLoleafletDebugAssets(type: Exec) {
- commandLine 'make', '-C', '../../',
"DIST_FOLDER=${project.getProjectDir()}/src/debug/assets/dist", 'BUNDLE=DEBUG'
+ commandLine 'make', '-C',
"${rootProject.getBuildDir()}/../../loleaflet",
"DIST_FOLDER=${project.getProjectDir()}/src/debug/assets/dist", 'BUNDLE=DEBUG'
}
task generateLoleafletReleaseAssets(type: Exec) {
- commandLine 'make', '-C', '../../',
"DIST_FOLDER=${project.getProjectDir()}/src/release/assets/dist",
'BUNDLE=RELEASE'
+ commandLine 'make', '-C',
"${rootProject.getBuildDir()}/../../loleaflet",
"DIST_FOLDER=${project.getProjectDir()}/src/release/assets/dist",
'BUNDLE=RELEASE'
}
afterEvaluate {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
