1 files changed, 17 insertions, 18 deletions
diff --git a/build-android/build.sh b/build-android/build.sh
index 3194c7e7..aa279595 100755
--- a/build-android/build.sh
+++ b/build-android/build.sh
@@ -1,17 +1,16 @@
 #!/bin/sh
 
-build_version=1
-ANDROID_PLATFORM=android-21
-archs="armeabi armeabi-v7a x86 x86_64"
+build_version=2
+ANDROID_PLATFORM=android-16
+archs="armeabi armeabi-v7a x86"
 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
-uchardet_build_version=1
-tidy_html5_build_version=1
-openssl_build_version=1
+ctemplate_build_version=2
+cyrus_sasl_build_version=2
+icu4c_build_version=2
+libetpan_build_version=2
+libxml2_build_version=2
+tidy_html5_build_version=2
+openssl_build_version=2
 
 current_dir="`pwd`"
 
@@ -44,13 +43,13 @@ function build {
     cd "$current_dir/jni"
     $ANDROID_NDK/ndk-build TARGET_PLATFORM=$ANDROID_PLATFORM TARGET_ARCH_ABI=$TARGET_ARCH_ABI \
         NDK_TOOLCHAIN_VERSION=4.9 \
-        CTEMPLATE_PATH=$current_dir/third-party/ctemplate-android-1 \
-        ICU4C_PATH=$current_dir/third-party/icu4c-android-1 \
-        LIBETPAN_PATH=$current_dir/third-party/libetpan-android-1 \
-        LIBXML2_PATH=$current_dir/third-party/libxml2-android-1 \
-        TIDY_HTML5_PATH=$current_dir/third-party/tidy-html5-android-1 \
-        OPENSSL_PATH=$current_dir/third-party/openssl-android-1 \
-        CYRUS_SASL_PATH=$current_dir/third-party/cyrus-sasl-android-1
+        CTEMPLATE_PATH=$current_dir/third-party/ctemplate-android-$ctemplate_build_version \
+        ICU4C_PATH=$current_dir/third-party/icu4c-android-$icu4c_build_version \
+        LIBETPAN_PATH=$current_dir/third-party/libetpan-android-$libetpan_build_version \
+        LIBXML2_PATH=$current_dir/third-party/libxml2-android-$libxml2_build_version \
+        TIDY_HTML5_PATH=$current_dir/third-party/tidy-html5-android-$tidy_html5_build_version \
+        OPENSSL_PATH=$current_dir/third-party/openssl-android-$openssl_build_version \
+        CYRUS_SASL_PATH=$current_dir/third-party/cyrus-sasl-android-$cyrus_sasl_build_version
 
     mkdir -p "$current_dir/bin/jni/$TARGET_ARCH_ABI"
     cp "$current_dir/libs/$TARGET_ARCH_ABI/libMailCore.so" "$current_dir/bin/jni/$TARGET_ARCH_ABI"