From d6c39f88b66ad613915b7c9475451f9bbe010046 Mon Sep 17 00:00:00 2001
From: "Hoa V. DINH" <dinh.viet.hoa@gmail.com>
Date: Wed, 10 Dec 2014 23:43:01 -0800
Subject: Android: Implemented MCMainThread, implemented certificate
 verification

---
 build-android/build.sh       | 5 ++++-
 build-android/jni/Android.mk | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'build-android')

diff --git a/build-android/build.sh b/build-android/build.sh
index c2e14c32..bb41aba3 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -5,6 +5,7 @@ ANDROID_PLATFORM=android-21
 archs="armeabi armeabi-v7a x86 x86_64"
 package_name=mailcore2-android
 ctemplate_build_version=1
+cyrus_sasl_build_version=1
 icu4c_build_version=1
 libetpan_build_version=1
 libxml2_build_version=1
@@ -44,7 +45,8 @@ function build {
         LIBXML2_PATH=$current_dir/third-party/libxml2-android-1 \
         UCHARDET_PATH=$current_dir/third-party/uchardet-android-1 \
         TIDY_HTML5_PATH=$current_dir/third-party/tidy-html5-android-1 \
-        OPENSSL_PATH=$current_dir/third-party/openssl-android-1
+        OPENSSL_PATH=$current_dir/third-party/openssl-android-1 \
+        CYRUS_SASL_PATH=$current_dir/third-party/cyrus-sasl-android-1
 
     mkdir -p "$current_dir/$package_name-$build_version/libs/$TARGET_ARCH_ABI"
     cp "$current_dir/libs/$TARGET_ARCH_ABI/libMailCore.so" "$current_dir/$package_name-$build_version/libs/$TARGET_ARCH_ABI"
@@ -70,6 +72,7 @@ download_dep "libxml2-android" $libxml2_build_version
 download_dep "uchardet-android" $uchardet_build_version
 download_dep "tidy-html5-android" $tidy_html5_build_version
 download_dep "openssl-android" $openssl_build_version
+download_dep "cyrus-sasl-android" $cyrus_sasl_build_version
 
 # Start building.
 for arch in $archs ; do
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 7f3b4aa0..d3eddf13 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -101,6 +101,11 @@ LOCAL_MODULE    := ctemplate
 LOCAL_SRC_FILES := $(CTEMPLATE_PATH)/libs/$(TARGET_ARCH_ABI)/libctemplate.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+include $(CLEAR_VARS)
+LOCAL_MODULE    := sasl2
+LOCAL_SRC_FILES := $(CYRUS_SASL_PATH)/libs/$(TARGET_ARCH_ABI)/libsasl2.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 include $(CLEAR_VARS)
 LOCAL_MODULE    := MailCore
 LOCAL_C_INCLUDES := $(includes)
@@ -110,7 +115,7 @@ LOCAL_SRC_FILES := $(core_src_files) $(abstract_src_files) $(imap_src_files) $(n
 	$(async_imap_src_files) $(async_nntp_src_files) $(async_pop_src_files) $(async_smtp_src_files)
 LOCAL_CPPFLAGS := -frtti
 LOCAL_CFLAGS := -DNOCRYPT
-LOCAL_LDLIBS := -lz \
+LOCAL_LDLIBS := -lz -llog \
 	 -lc++_shared -L$(ANDROID_NDK)/sources/cxx-stl/llvm-libc++/libs/$(TARGET_ARCH_ABI)
-LOCAL_STATIC_LIBRARIES := etpan ssl crypto icu4c xml2 uchardet tidy ctemplate
+LOCAL_STATIC_LIBRARIES := etpan sasl2 ssl crypto icu4c xml2 uchardet tidy ctemplate
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3