bug fix

leenjewel · Jul 20, 2017 · 8a6eef5 · 8a6eef5 · GajanandSwamy · Nov 21, 2017
1 parent 85ec79a
commit 8a6eef5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/tools/_shared.sh b/tools/_shared.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 TOOLS_ROOT=`pwd`
-ARCHS=("android" "android-armeabi" "android64-aarch64" "android-x86" "android64" "android-mips" "android-mips64")
 
 #
 # Warning !!! Android Build !!!
@@ -15,9 +14,18 @@ ARCHS=("android" "android-armeabi" "android64-aarch64" "android-x86" "android64"
 #
 # So if you not need 64 bit arch api level 16 is better
 #
-ANDROID_API=${ANDROID_API:-16}
+# But but but cURL could not build by android-20 and earlier :-(
+# So you can build openssl with android-16 then build cURL with android-21
+#
+if [ "${1}" == "cURL" ]; then
+    ANDROID_API=${ANDROID_API:-21}
+else
+    ANDROID_API=${ANDROID_API:-16}
+fi
+ARCHS=("android" "android-armeabi" "android-x86" "android-mips")
 ABIS=("armeabi" "armeabi-v7a" "x86" "mips")
 # ANDROID_API=${ANDROID_API:-21}
+# ARCHS=("android" "android-armeabi" "android64-aarch64" "android-x86" "android64" "android-mips" "android-mips64")
 # ABIS=("armeabi" "armeabi-v7a" "arm64-v8a" "x86" "x86_64" "mips" "mips64")
 NDK=${ANDROID_NDK}
 

diff --git a/tools/build-curl4android.sh b/tools/build-curl4android.sh
@@ -16,11 +16,11 @@
 
 set -u
 
-source ./_shared.sh
+source ./_shared.sh cURL
 
 # Setup architectures, library name and other vars + cleanup from previous runs
 TOOLS_ROOT=`pwd`
-LIB_NAME="curl-7.53.1"
+LIB_NAME="curl-7.54.1"
 LIB_DEST_DIR=${TOOLS_ROOT}/libs
 [ -f ${LIB_NAME}.tar.gz ] || wget https://curl.haxx.se/download/${LIB_NAME}.tar.gz
 # Unarchive library, then configure and make for specified architectures