From 5ba5c06a72c4970363753acb53876f52e6db9c1c Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Mon, 8 Apr 2019 12:07:31 +0200
Subject: [PATCH] Adapt android build files to sync.

---
 android/build.gradle   |  7 ++++---
 android/jni/Android.mk | 13 +++++++++----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index d95d370..88a5d8b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -95,7 +95,7 @@ android {
     }
 
     // call source generation makefile target
-    task genSources(type:Exec, dependsOn: 'genpEpEngineSyncSources') {
+    task genSources(type:Exec, dependsOn: 'genpEpEngineAsn1Sources') {
         workingDir '../src'
         commandLine 'make', 'gensource'
     }
@@ -105,10 +105,11 @@ android {
         commandLine 'make', '-C', 'sync'
     }
 
-    /*task genpEpEngineAsn1Sources(type:Exec) {
+
+    task genpEpEngineAsn1Sources(type:Exec, dependsOn: 'genpEpEngineSyncSources') {
         workingDir '../../pEpEngine'
         commandLine 'make', '-C', 'asn.1', 'generate'
-    }*/
+    }
 
     task cleanGenSource(type:Exec) {
         workingDir '../src'
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 94a658e..1c95ffb 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -1,4 +1,5 @@
 LOCAL_PATH:= $(call my-dir)
+SRC_PATH := $(LOCAL_PATH)/../../../
 ENGINE_PATH := $(LOCAL_PATH)/../../../pEpEngine
 GPGBUILD:= $(LOCAL_PATH)/../external/data/data/security.pEp/app_opt
 
@@ -57,9 +58,9 @@ $(shell sh $(ENGINE_PATH)/build-android/takeOutHeaderFiles.sh $(ENGINE_PATH))
 include $(CLEAR_VARS)
 LOCAL_MODULE     := pEpJNI
 LOCAL_SHARED_LIBRARIES := libgpgme libassuan libcurl libgcrypt libgpg-error
-LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid
+LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter
 LOCAL_CPP_FEATURES += exceptions
-LOCAL_CFLAGS += -DHAVE_PTHREADS -DANDROID_STL=c++_shared
+LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC
 LOCAL_SRC_FILES  := \
 		  ../../src/org_pEp_jniadapter_AbstractEngine.cc \
 		  ../../src/org_pEp_jniadapter_Engine.cc \
@@ -69,6 +70,7 @@ LOCAL_SRC_FILES  := \
 		  ../../src/jniutils.cc
 
 LOCAL_C_INCLUDES += $(GPGBUILD)/include
+LOCAL_C_INCLUDES += $(LIB_PEP_ADAPTER_PATH)/build-android/include $(SRC_PATH)/libpEpAdapter
 LOCAL_LDLIBS    += -llog
 include $(BUILD_SHARED_LIBRARY)
 
@@ -79,5 +81,8 @@ LOCAL_CFLAGS += -DANDROID_STL=c++_shared
 LOCAL_SRC_FILES  := org_pEp_jniadapter_AndroidHelper.cc
 
 include $(BUILD_SHARED_LIBRARY)
-$(call import-add-path,$(ENGINE_PATH))
-$(call import-module, build-android/jni/)
+$(call import-add-path,$(SRC_PATH))
+$(call import-module, pEpEngine/build-android/jni/)
+$(info $(LOCAL_PATH))
+$(call import-module, libpEpAdapter/build-android/jni/)
+$(info $(LOCAL_PATH))