[Libreoffice-commits] online.git: android/build.gradle.in android/.gitignore android/lib

[Henry Castro (via logerrit)]

 android/.gitignore       |    3 +++
 android/build.gradle.in  |    4 ++++
 android/lib/build.gradle |    2 ++
 3 files changed, 9 insertions(+)

New commits:
commit e7c75fda31606834af666588bb52877cdcfe38db
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Mon Jun 1 17:40:21 2020 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Thu Jun 11 21:34:21 2020 +0200

    android: clean debug and release assets
    
    Change-Id: I3e6c53f6d82169ba5a529a63bae9256fb43d69ed
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95332
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Tested-by: Jenkins
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/android/.gitignore b/android/.gitignore
index afb2ba6d8..70c5f8390 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,5 +1,6 @@
 .gradle
 .idea
+/build
 /android.iml
 /build.gradle
 /local.properties
@@ -12,4 +13,6 @@
 /lib/src/main/assets/share/
 /lib/src/main/assets/unpack/
 /lib/src/main/assets/user/
+/lib/src/debug/assets
+/lib/src/release/assets
 /lib/src/main/cpp/lib
diff --git a/android/build.gradle.in b/android/build.gradle.in
index 5b78812cb..fd2b2fc5e 100644
--- a/android/build.gradle.in
+++ b/android/build.gradle.in
@@ -24,3 +24,7 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+afterEvaluate {
+    clean.dependsOn(':lib:clean')
+}
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 1b1eb90df..c3b3621b9 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -291,6 +291,8 @@ ReferenceOOoMajorMinor=4.1
 
 clean.doFirst {
 	delete "src/main/assets"
+	delete "src/debug/assets"
+	delete "src/release/assets"
 }
 
 // creating the UI stuff is cheap, don't bother only applying it for the flavor..