From d2b6cc38724d73dddb253b410f436340e8ec489e Mon Sep 17 00:00:00 2001
From: ignaciogarcia <ig@pep.security>
Date: Thu, 3 Nov 2022 09:04:10 +0100
Subject: [PATCH 1/3] PEMA-103 Make engine depend on transport

holly mess
---
 build-android/jni/Android.mk        | 27 +++++++++++++++++++++++++++
 build-android/jni/Application.mk    |  5 +++++
 build-android/takeOutHeaderFiles.sh | 10 ++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 build-android/jni/Android.mk
 create mode 100644 build-android/jni/Application.mk
 create mode 100755 build-android/takeOutHeaderFiles.sh

diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
new file mode 100644
index 0000000..14796d1
--- /dev/null
+++ b/build-android/jni/Android.mk
@@ -0,0 +1,27 @@
+$(warning ==== LIBPEPTRANSPORT android.mk START)
+LOCAL_PATH := $(call my-dir)
+
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := pEpTransport
+
+
+LOCAL_CPP_FEATURES += exceptions
+LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared
+
+#FIXME: WORKAROUND
+STUB = $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine/ $(LOCAL_PATH)/../../)
+$(info $(STUB))
+
+LIB_PEP_TRANSPORT_INCLUDE_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.h*)
+
+LOCAL_C_INCLUDES += $(LIB_PEP_TRANSPORT_INCLUDE_FILES:%=%)
+
+LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
+
+LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/../../src/*.c)
+
+
+include $(BUILD_STATIC_LIBRARY)
+
diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk
new file mode 100644
index 0000000..85c6eb6
--- /dev/null
+++ b/build-android/jni/Application.mk
@@ -0,0 +1,5 @@
+APP_STL := c++_shared
+APP_OPTIM := debug
+APP_PLATFORM=android-18
+APP_ABI := armeabi-v7a
+NDK_TOOLCHAIN_VERSION = clang
diff --git a/build-android/takeOutHeaderFiles.sh b/build-android/takeOutHeaderFiles.sh
new file mode 100755
index 0000000..3677b77
--- /dev/null
+++ b/build-android/takeOutHeaderFiles.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo "Install script"
+set -e
+engine_dir="$1"
+adapter_dir="$2"
+
+mkdir -p "$engine_dir/build-android/include/pEp"
+cp $2/src/*.h* "$engine_dir/build-android/include/pEp"
+

From be19e65428c5afb2012b65a9d0a3d1936abfa8d2 Mon Sep 17 00:00:00 2001
From: ignaciogarcia <ig@pep.security>
Date: Thu, 3 Nov 2022 12:08:33 +0100
Subject: [PATCH 2/3] PEMA-103 Blocked with uuid static library building

---
 build-android/jni/Android.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 14796d1..83f8de6 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -7,8 +7,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := pEpTransport
 
 
-LOCAL_CPP_FEATURES += exceptions
-LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared
+#LOCAL_CPP_FEATURES += exceptions
+LOCAL_CPPFLAGS += -std=c99
 
 #FIXME: WORKAROUND
 STUB = $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine/ $(LOCAL_PATH)/../../)

From 7e233c2a0cf9fccd35ab639301549a992af361fd Mon Sep 17 00:00:00 2001
From: Sascha Bacardit <saschabacardit@gmail.com>
Date: Fri, 4 Nov 2022 15:54:40 +0100
Subject: [PATCH 3/3] PEMA-103

Updated transport
---
 build-android/jni/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 83f8de6..00cd709 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -16,7 +16,8 @@ $(info $(STUB))
 
 LIB_PEP_TRANSPORT_INCLUDE_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.h*)
 
-LOCAL_C_INCLUDES += $(LIB_PEP_TRANSPORT_INCLUDE_FILES:%=%)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../pEpEngine/build-android/include \
+				$(LIB_PEP_TRANSPORT_INCLUDE_FILES:%=%)
 
 LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include