From 294edb062102cd64520e6fcb2614956cbac5bc3e Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Sat, 2 Mar 2024 08:38:22 +0100
Subject: [PATCH] host copy libs + openssl "fix"

---
 .github/workflows/android.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index d6f65a2..d654c72 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -209,6 +209,14 @@ jobs:
           && ./Configure android-${{ matrix.short_arch }} -D__ANDROID_API__=21 -static no-shared no-tests --with-zlib-include=${WORKDIR}/zlib/include --with-zlib-lib=${WORKDIR}/zlib/lib --prefix=${PREFIX} --openssldir=${PREFIX} \
           && make -j${NPROC} &>/tmp/openssl_log.txt || cat /tmp/openssl_log.txt \
           && make install_sw  &>/tmp/openssl_log_2.txt || cat /tmp/openssl_log_2.txt
+      - name: Build OpenSSL (alt)
+        run: |
+          cd ${{ github.workspace }} \
+          && cd openssl-${OPENSSL_VERSION} \
+          && export PATH=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH \
+          && ./Configure android-${{ matrix.short_arch }} -D__ANDROID_API__=21 -static no-shared no-tests --with-zlib-include=${WORKDIR}/zlib/include --with-zlib-lib=${WORKDIR}/zlib/lib --prefix=${PREFIX}/openssl --openssldir=${PREFIX}/openssl \
+          && make -j${NPROC} &>/tmp/openssl_log.txt || cat /tmp/openssl_log.txt \
+          && make install_sw  &>/tmp/openssl_log_2.txt || cat /tmp/openssl_log_2.txt
       - name: Build ZMQ
         run: |
           cd ${{ github.workspace }} \
@@ -296,6 +304,7 @@ jobs:
       - name: Build libbridge (2/2) make
         run: |
           cd ${{ github.workspace }} \
+          && make host_copy_libs \
           && cd libbridge \
           && cd build \
           && make -j${NPROC}