From 74d6acb95f70a49b4efb87a9749a59d37d55ba17 Mon Sep 17 00:00:00 2001
From: Hussein Kasem <huss@pep-project.org>
Date: Fri, 19 Aug 2022 00:31:36 +0200
Subject: [PATCH] JNI-178 Android-Build: Move dependencies arround

---
 android/build.gradle   |  6 +++---
 android/jni/Android.mk | 14 +++++++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 171b91a..f065690 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -27,11 +27,11 @@ allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 32
         versionCode 7
         versionName "2.1.43"
 
@@ -78,7 +78,7 @@ android {
             jniDebuggable true
             externalNativeBuild {
                 ndkBuild {
-                    arguments "-j${threadsToUse}", 'NDK_LOG=0', 'NDK_DEBUG=1', 'NDEBUG=null', '--output-sync=none'
+                    arguments "-j${threadsToUse}", 'NDK_LOG=1', 'NDK_DEBUG=1', 'NDEBUG=null', '--output-sync=none'
                    // arguments '-B', 'NDK_DEBUG=1', 'NDEBUG=null', 'NDK_LOG=1'
                 }
             }
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 5366bc0..996cf5a 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -38,20 +38,24 @@ LOCAL_EXPORT_LDLIBS := -lz
 include $(PREBUILT_STATIC_LIBRARY)
 
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := libcryptopp
+LOCAL_SRC_FILES := $(GPGBUILD)/$(TARGET_ARCH_ABI)/lib/libcryptopp.so
+include $(PREBUILT_SHARED_LIBRARY)
+
 
 #Take out Engine Headers
 $(shell sh $(ENGINE_PATH)/build-android/takeOutHeaderFiles.sh $(ENGINE_PATH))
 
 include $(CLEAR_VARS)
 LOCAL_MODULE     := pEpJNI
-LOCAL_SHARED_LIBRARIES := libnettle libhogweed libgmp libcryptopp
-LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter libsequoia_openpgp_ffi downloadclient signedpkg
-LOCAL_STATIC_LIBRARIES += libssl libcrypto libboost_system  libboost_regex libboost_iostreams
+LOCAL_SHARED_LIBRARIES := libnettle libhogweed libgmp
+LOCAL_STATIC_LIBRARIES := pEpEngine libetpan libiconv libuuid pEpAdapter libsequoia_openpgp_ffi signedpkg
 
 LOCAL_CPPFLAGS += -fexceptions
 LOCAL_CPPFLAGS += -frtti
 
-LOCAL_CPP_FEATURES += exceptiovns
+LOCAL_CPP_FEATURES += exceptions
 LOCAL_CPPFLAGS += -std=c++17 -DANDROID_STL=c++_shared -DHAVE_PTHREADS -DDISABLE_SYNC -fuse-ld=lld
 LOCAL_SRC_FILES  := \
 		  ../../src/cxx/foundation_pEp_jniadapter_AbstractEngine.cc \
@@ -81,6 +85,6 @@ $(call import-add-path,$(SRC_PATH))
 $(call import-module, pEpEngine/build-android/jni/)
 $(call import-module, libpEpAdapter/build-android/jni/)
 $(call import-module, signedpkg/build-android/jni)
-$(call import-module, downloadclient/build-android/jni)
+#$(call import-module, downloadclient/build-android/jni)
 $(info $(LOCAL_PATH))
 $(call import-module, pEpJNIAdapter/android/external/$(TARGET_ARCH_ABI)/uuid/jni)