From 8018ec827632ce895444c9ec088d2a2341039bf9 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Wed, 14 Oct 2015 18:56:00 +0200
Subject: [PATCH] Android: more gradle rules tweaking

---
 android/build.gradle | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 7f099dc..e01bccf 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -82,6 +82,11 @@ android {
         commandLine 'make', 'clean', 'PEP_PACKAGE_NAME='+pEpAppPackageName
     }
 
+    task cleanExternalAssets(type:Exec) {
+        workingDir 'external'
+        commandLine 'make', 'clean-assets', 'PEP_PACKAGE_NAME='+pEpAppPackageName
+    }
+
     // call pEpEngine Build 
     task buildpEpEngine(type:Exec) {
         workingDir pEpEngineAndroid
@@ -112,10 +117,8 @@ android {
     }
 
     // This ensures that assets are populated before collecting resources.
-    libraryVariants.all { variant ->
-        variant.preBuild.dependsOn(cpDBAssets)
-        variant.preBuild.dependsOn(externalAssets)
-    }
+    preBuild.dependsOn(cpDBAssets)
+    preBuild.dependsOn(externalAssets)
 
     // call regular ndk-build(.cmd) script from app directory
     task jniBuild(type: Exec) {
@@ -135,6 +138,7 @@ android {
         ignoreExitValue = true
     }
     clean.dependsOn jniClean
+    clean.dependsOn cleanExternalAssets
 
     if(buildAutomatic=="true"){