From 767339486794adf9db772672f25d46a88718138a Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Mon, 19 Dec 2016 02:39:53 +0100
Subject: [PATCH] Explicitely distinguish pEpEngine release and debug builds.
 Debug build has to be launched explicitely with 'gradle buildpEpEngineDebug'

---
 android/build.gradle | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c209d9b..903e755 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -110,11 +110,19 @@ android {
         commandLine 'make', 'clean-assets', 'PEP_PACKAGE_NAME='+pEpAppPackageName
     }
 
+    task buildpEpEngineDebug(type:Exec) {
+        workingDir pEpEngineAndroid
+        environment['GPGME_INCLUDE_PATH'] = externalIncludePath
+        environment['LIBETPAN_PATH'] = libetpanAndroid.absolutePath
+        commandLine './build.sh'
+    }
+
     // call pEpEngine Build 
-    task buildpEpEngine(type:Exec) {
+    task buildpEpEngineRelease(type:Exec) {
         workingDir pEpEngineAndroid
         environment['GPGME_INCLUDE_PATH'] = externalIncludePath
         environment['LIBETPAN_PATH'] = libetpanAndroid.absolutePath
+        environment['NDEBUG'] = 'NO_DEBUG_PLEASE'
         commandLine './build.sh'
     }
 
@@ -171,9 +179,9 @@ android {
 
     if(buildAutomatic=="true"){
 
-        buildpEpEngine.dependsOn buildExternal
+        buildpEpEngineRelease.dependsOn buildExternal
         externalAssets.dependsOn buildExternal
-        unzipDeps.dependsOn buildpEpEngine
+        unzipDeps.dependsOn buildpEpEngineRelease
         cpDBAssets.dependsOn buildpEpEngineSystemDB
 
         clean.dependsOn cleanExternal