]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
android: Use custom-built OpenSSL for GH action
authorTobias Brunner <tobias@strongswan.org>
Thu, 9 Feb 2023 16:06:47 +0000 (17:06 +0100)
committerTobias Brunner <tobias@strongswan.org>
Mon, 13 Feb 2023 14:30:58 +0000 (15:30 +0100)
scripts/test.sh

index 1ccd32beb20054db5c8c132a9fad9312915572b1..10d0493558b086a95dcc93118c105c24f5e065be 100755 (executable)
@@ -110,13 +110,19 @@ build_openssl()
 
        echo "$ build_openssl()"
 
-       curl -L $SSL_SRC | tar xz -C $DEPS_BUILD_DIR &&
-       cd $SSL_DIR &&
-       ./config --prefix=$SSL_INS --openssldir=$SSL_INS --libdir=lib $SSL_OPT &&
-       make -j4 >/dev/null &&
-       sudo make install_sw >/dev/null &&
-       sudo ldconfig || exit $?
-       cd -
+       curl -L $SSL_SRC | tar xz -C $DEPS_BUILD_DIR || exit $?
+
+       if [ "$TEST" = "android" ]; then
+               OPENSSL_SRC=${SSL_DIR} \
+               NO_DOCKER=1 src/frontends/android/openssl/build.sh || exit $?
+       else
+               cd $SSL_DIR &&
+               ./config --prefix=$SSL_INS --openssldir=$SSL_INS --libdir=lib $SSL_OPT &&
+               make -j4 >/dev/null &&
+               sudo make install_sw >/dev/null &&
+               sudo ldconfig || exit $?
+               cd -
+       fi
 }
 
 use_custom_openssl()
@@ -308,9 +314,8 @@ win*)
        esac
        ;;
 android)
-       if test "$1" = "deps"; then
-               git clone https://github.com/strongswan/boringssl.git -b ndk-static \
-                       src/frontends/android/app/src/main/jni/openssl
+       if test "$1" = "build-deps"; then
+               build_openssl
        fi
        TARGET=distdir
        ;;