From 7195993a5fe99fc7a967cbe3ad49e7dedb244d5e Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Mon, 20 Mar 2017 11:38:52 +0100
Subject: [PATCH] Update engine version and fix build from scratch

---
 android/build.gradle                          | 23 ++++---------------
 .../src/org/pEp/jniadapter/AndroidHelper.java |  2 +-
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 1160ad6..99af724 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,7 +1,5 @@
 // Android pEp JNI adapter Aar gradle build script
 
-import org.apache.tools.ant.taskdefs.condition.Os
-
 def pEpEngineSrc = hasProperty('pEpEngineSrc') ? pEpEngineSrc : "../../pEpEngine"
 def buildAutomatic = hasProperty('buildAutomatic') ? buildAutomatic : "true"
 def pEpAppPackageName = hasProperty('pEpAppPackageName') ? pEpAppPackageName : "pep.android.k9"
@@ -152,26 +150,13 @@ android {
         into 'assets'
     }
 
-    // This ensures that assets are populated before collecting resources.
-    preBuild.dependsOn(cpDBAssets)
-    preBuild.dependsOn(externalAssets)
-
-    //unzipDeps.dependsOn buildExternal
-
-    //Should be modified to build automatic only build external not engine or engine db
-
     if(buildAutomatic == "true") {
-        preBuild.dependsOn(genSources)
-//
-//        buildpEpEngineDebug.dependsOn buildExternal
-//        externalAssets.dependsOn buildExternal
-//        unzipDeps.dependsOn buildpEpEngineDebug
-//        cpDBAssets.dependsOn buildpEpEngineSystemDB
-//
-//        clean.dependsOn cleanExternal
-//        clean.dependsOn cleanpEpEngine
+        buildpEpEngineSystemDB.dependsOn(unzipDeps)
     }
 
+    // This ensures that assets are populated before collecting resources.
+    preBuild.dependsOn(cpDBAssets)
+    preBuild.dependsOn(externalAssets)
 }
 
 
diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java
index 6b055c5..f385601 100644
--- a/android/src/org/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/org/pEp/jniadapter/AndroidHelper.java
@@ -29,7 +29,7 @@ public class AndroidHelper {
     private static File tmpDir;
         
     // TODO : Increment when needed.
-    public static int ENGINE_VERSION_CODE = 1604;
+    public static int ENGINE_VERSION_CODE = 1669;
 
     private static File shareDir;