[Libreoffice-commits] online.git: android/lib android/Makefile.am configure.ac Makefile.am

[Henry Castro (via logerrit)]

 Makefile.am              |    4 ----
 android/Makefile.am      |   16 ----------------
 android/lib/build.gradle |   19 +++++++++++++++++++
 configure.ac             |    3 +--
 4 files changed, 20 insertions(+), 22 deletions(-)

New commits:
commit a2410c599cf4855fa1ed04194e76c291a134964b
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Apr 22 12:33:33 2020 -0400
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Apr 23 09:09:11 2020 +0200

    android: convert remaining rules to gradle tasks
    
    It will give an Independence (at least) to the
    gradle build system to package the product
    
    Change-Id: I127c2f921b506ec280a244d609707f3480e0f92e
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92719
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/Makefile.am b/Makefile.am
index ff7ad0b5f..dcbfbdcbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,12 +5,8 @@ if ENABLE_MOBILEAPP
 if ENABLE_GTKAPP
 SUBDIRS = gtk loleaflet
 else
-if ENABLE_ANDROIDAPP
-SUBDIRS = loleaflet android
-else
 SUBDIRS = loleaflet
 endif
-endif
 
 else
 
diff --git a/android/Makefile.am b/android/Makefile.am
deleted file mode 100644
index d717a8b6a..000000000
--- a/android/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-clean-local:
-	rm -rf $(abs_top_srcdir)/android/lib/src/main/assets/*
-	rm -rf app/build
-
-all-local: lib/src/main/assets/templates/untitled.odp \
-	   lib/src/main/assets/templates/untitled.ods \
-	   lib/src/main/assets/templates/untitled.odt \
-	   lib/src/main/assets/etc/loolwsd/loolkitconfig.xcu
-
-lib/src/main/assets/templates/untitled.%: templates/untitled.%
-	@mkdir -p $(dir $@)
-	@cp -a $< $@
-
-lib/src/main/assets/etc/loolwsd/loolkitconfig.xcu: $(top_srcdir)/loolkitconfig-mobile.xcu
-	@mkdir -p $(dir $@)
-	@cp -a $< $@
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 94c505d42..50cb2fc43 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -186,6 +186,19 @@ task copyBrandTheme(type: Copy) {
 	into "src/main/assets/share/theme_definitions/online"
 }
 
+task copyDocTemplates(type: Copy) {
+        from "${rootProject.getRootDir()}/templates/untitled.odp",
+             "${rootProject.getRootDir()}/templates/untitled.ods",
+             "${rootProject.getRootDir()}/templates/untitled.odt"
+        into "src/main/assets/templates"
+}
+
+task copyKitConfig(type: Copy) {
+        from "${file(rootProject.getRootDir()).getParent()}/loolkitconfig-mobile.xcu"
+        into "src/main/assets/etc/loolwsd"
+        rename { "loolkitconfig.xcu" }
+}
+
 task createStrippedConfig {
     def preserveDir = file("src/main/assets/share/config/soffice.cfg/empty")
     outputs.dir "src/main/assets/share/registry/res"
@@ -276,6 +289,10 @@ ReferenceOOoMajorMinor=4.1
     }
 }
 
+clean.doFirst {
+	delete "src/main/assets"
+}
+
 // creating the UI stuff is cheap, don't bother only applying it for the flavor..
 preBuild.dependsOn 'createRCfiles',
         'createFullConfig',
@@ -285,4 +302,6 @@ afterEvaluate {
 	if (!file("${liboBrandingDir}").exists()) {
 		copyBrandTheme.enabled = false
 	}
+	generateDebugAssets.dependsOn copyDocTemplates, copyKitConfig
+	generateReleaseAssets.dependsOn copyDocTemplates, copyKitConfig
 }
diff --git a/configure.ac b/configure.ac
index 013a2c492..8973269d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1080,8 +1080,7 @@ if test "$enable_iosapp" = "yes"; then
 fi
 
 if test "$enable_androidapp" = "yes"; then
-    AC_CONFIG_FILES([android/Makefile
-                 $srcdir/android/build.gradle:android/build.gradle.in
+    AC_CONFIG_FILES([$srcdir/android/build.gradle:android/build.gradle.in
                  $srcdir/android/app/appSettings.gradle:android/app/appSettings.gradle.in
                  $srcdir/android/lib/libSettings.gradle:android/lib/libSettings.gradle.in
                  $srcdir/android/lib/src/main/cpp/CMakeLists.txt:android/lib/src/main/cpp/CMakeLists.txt.in])