From adfff2999475ea5bb327fef874f5c4e18f724f11 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Mon, 22 Feb 2016 18:29:01 +0100
Subject: [PATCH] Android: Disabled build of ssl and sasl for libetpan, forced
 libetpan to use iconv already built for gpg

---
 android/build.gradle      |  8 ++++----
 android/external/Makefile |  4 ++--
 android/jni/Android.mk    | 34 ++++++++++++++++++++--------------
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index ddcc236..d4dc2df 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -74,8 +74,8 @@ android {
     ext {
         pEpEngineZip = new File(pEpEngineAndroid, 'pEpEngine-android-1.zip')
         libEtPanZip = new File(libetpanAndroid, 'libetpan-android-1.zip')
-        libOpenSslZip = new File(libetpanAndroid, 'dependencies/openssl/openssl-android-1.zip')
-        libSaslZip = new File(libetpanAndroid, 'dependencies/cyrus-sasl/cyrus-sasl-android-1.zip')
+        // libOpenSslZip = new File(libetpanAndroid, 'dependencies/openssl/openssl-android-1.zip')
+        // libSaslZip = new File(libetpanAndroid, 'dependencies/cyrus-sasl/cyrus-sasl-android-1.zip')
     }
 
     // call source generation makefile target
@@ -121,8 +121,8 @@ android {
     task unzipDeps(type: Copy) {
         from zipTree(pEpEngineZip)
         from zipTree(libEtPanZip)
-        from zipTree(libOpenSslZip)
-        from zipTree(libSaslZip)
+        // from zipTree(libOpenSslZip)
+        // from zipTree(libSaslZip)
         into file("${buildDir}")
     }
 
diff --git a/android/external/Makefile b/android/external/Makefile
index d61eed9..1c189ba 100644
--- a/android/external/Makefile
+++ b/android/external/Makefile
@@ -403,7 +403,7 @@ gpgme-install: $(LOCAL)/bin/gpg2 $(LOCAL)/lib/libgpgme.so
 EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD
 
 libetpan/libetpan-android-1.zip: libetpan.src.stamp
-	cd libetpan/build-android; ./build.sh
+	cd libetpan/build-android; ICONV_PREFIX=$(LOCAL) ./build.sh
 
 libetpan-build: libetpan/libetpan-android-1.zip
 
@@ -437,7 +437,7 @@ assets: clean-assets
 #------------------------------------------------------------------------------#
 # Clone update and archive external projects GIT repos
 # Local clone is in external/$project.git while 
-# slected commit is archived in external/$project
+# selected commit is archived in external/$project
 
 define per_repo_targets
 $(1).git.stamp:
diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 8eb6b21..de3edc0 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -32,18 +32,23 @@ LOCAL_SRC_FILES := $(GPGBUILD)/lib/libksba.so
 include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := openssl
-LOCAL_SRC_FILES := ../build/openssl-android-1/libs/$(TARGET_ARCH_ABI)/libcrypto.a
-#\
-#                   ../build/openssl-android-1/libs/$(TARGET_ARCH_ABI)/libssl.a
-LOCAL_EXPORT_C_INCLUDES := build/openssl-android-1/include
-include $(PREBUILT_STATIC_LIBRARY)
+LOCAL_MODULE := libiconv
+LOCAL_SRC_FILES := $(GPGBUILD)/lib/libiconv.so
+include $(PREBUILT_SHARED_LIBRARY)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := cyrus-sasl
-LOCAL_SRC_FILES := ../build/cyrus-sasl-android-1/libs/$(TARGET_ARCH_ABI)/libsasl2.a
-LOCAL_EXPORT_C_INCLUDES := build/cyrus-sasl-android-1/include
-include $(PREBUILT_STATIC_LIBRARY)
+# include $(CLEAR_VARS)
+# LOCAL_MODULE := openssl
+# LOCAL_SRC_FILES := ../build/openssl-android-1/libs/$(TARGET_ARCH_ABI)/libcrypto.a
+# #\
+# #                   ../build/openssl-android-1/libs/$(TARGET_ARCH_ABI)/libssl.a
+# LOCAL_EXPORT_C_INCLUDES := build/openssl-android-1/include
+# include $(PREBUILT_STATIC_LIBRARY)
+# 
+# include $(CLEAR_VARS)
+# LOCAL_MODULE := cyrus-sasl
+# LOCAL_SRC_FILES := ../build/cyrus-sasl-android-1/libs/$(TARGET_ARCH_ABI)/libsasl2.a
+# LOCAL_EXPORT_C_INCLUDES := build/cyrus-sasl-android-1/include
+# include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libetpan
@@ -60,8 +65,9 @@ include $(PREBUILT_STATIC_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE     := pEpJNI
-LOCAL_SHARED_LIBRARIES := libgpgme
-LOCAL_STATIC_LIBRARIES := pEpEngine libetpan openssl cyrus-sasl 
+LOCAL_SHARED_LIBRARIES := libgpgme libiconv
+LOCAL_STATIC_LIBRARIES := pEpEngine libetpan
+# openssl cyrus-sasl 
 LOCAL_CPP_FEATURES += exceptions
 LOCAL_SRC_FILES  := \
 		  ../../src/org_pEp_jniadapter_AbstractEngine.cc \
@@ -71,7 +77,7 @@ LOCAL_SRC_FILES  := \
 		  ../../src/basic_api.cc \
 		  ../../src/jniutils.cc
 LOCAL_C_INCLUDES := ../../src
-#LOCAL_LDLIBS    := -llog
+# LOCAL_LDLIBS    := -llog
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)