[Android] Fix armv6 vcpkg build.

Use curl 7.80.0 for non-vcpkg Android build. Signed-off-by: Vitalii Koshura <[email protected]>
gordon1929 · Nov 24, 2021 · 9208bca · 9208bca
1 parent bd32d11
commit 9208bca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/android/buildAndroidBOINC-CI.sh b/android/buildAndroidBOINC-CI.sh
@@ -23,7 +23,7 @@ set -e
 export REV=1
 export ARMV6_REV=1
 export OPENSSL_VERSION=1.1.1l
-export CURL_VERSION=7.78.0
+export CURL_VERSION=7.80.0
 export NDK_VERSION=21d
 export NDK_ARMV6_VERSION=15c
 
@@ -306,7 +306,7 @@ vcpkgDir()
     arch=$1
     shift
     vcpkg_dir="$VCPKG_ROOT/installed"
-    
+
     if [ $arch = "armv6" ]; then
         vcpkg_dir="$vcpkg_dir/armv6-android"
     elif [ $arch = "arm" ]; then

diff --git a/android/build_boinc_armv6.sh b/android/build_boinc_armv6.sh
@@ -79,6 +79,8 @@ if [ -n "$COMPILEBOINC" ]; then
             export _libcurl_pc="$VCPKG_DIR/lib/pkgconfig/libcurl.pc"
         fi
         ./configure --host=armv6-linux --with-boinc-platform="arm-android-linux-gnu" $CONFIG_FLAGS --disable-server --disable-manager --disable-shared --enable-static --disable-largefile
+        sed -e "s%^CLIENTLIBS *= *.*$%CLIENTLIBS = -lm $STDCPPTC%g" client/Makefile > client/Makefile.out
+        mv client/Makefile.out client/Makefile
     fi
     echo MAKE_FLAGS=$MAKE_FLAGS
     make $MAKE_FLAGS