android build openssl in the makefile

Author: Gioee

.github/workflows/main.yml

@@ -61,28 +61,6 @@ jobs:
             mingw-w64-x86_64-cc
             mingw-w64-x86_64-autotools make
 
-      - name: build openssl
-        if: matrix.name == 'android'
-        run: |
-          git clone https://github.com/openssl/openssl.git
-          cd openssl
-          export TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64
-          export ARCH=${{ matrix.arch }}
-          export PATH=$TOOLCHAIN/bin:$PATH
-
-          ./Configure android-${{ matrix.arch == 'arm64-v8a' && 'arm64' || matrix.arch }} \
-            --prefix=$PWD/build \
-            --openssldir=$PWD/build/ssl \
-            no-shared \
-            no-unit-test \
-            -D__ANDROID_API__=26
-          make
-          make install_sw
-
-          cp build/lib/libssl.a $TOOLCHAIN/sysroot/usr/lib/
-          cp build/lib/libcrypto.a $TOOLCHAIN/sysroot/usr/lib/
-          cp -r build/include/openssl $TOOLCHAIN/sysroot/usr/include/
-
       - name: build sqlite-sync
         run: make ${{ matrix.make && matrix.make || ''}}
         shell: bash

Makefile

@@ -82,6 +82,7 @@ else ifeq ($(PLATFORM),android)
     endif
 
     BIN = $(ANDROID_NDK)/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin
+    PATH := $(BIN):$(PATH)
 
     ifneq (,$(filter $(ARCH),arm64 arm64-v8a))
         override ARCH := aarch64
@@ -172,7 +173,21 @@ ifneq ($(COVERAGE),false)
 	genhtml $(COV_DIR)/coverage.info --output-directory $(COV_DIR)
 endif
 
+openssl:
+	git clone https://github.com/openssl/openssl.git $(CURL_DIR)/src/openssl
+
+	cd $(CURL_DIR)/src/openssl && \
+	./Configure android-$(if $(filter aarch64,$(ARCH)),arm64,$(ARCH)) \
+	    --prefix=$(ANDROID_NDK)/toolchains/sysroot/usr \
+	    no-shared no-unit-test \
+	    -D__ANDROID_API__=26 && \
+	make && make install_sw
+
+ifeq ($(PLATFORM),android)
+$(CURL_LIB): openssl
+else
 $(CURL_LIB):
+endif
 	mkdir -p $(CURL_DIR)/src
 	curl -L -o $(CURL_DIR)/src/curl.zip "https://github.com/curl/curl/releases/download/curl-$(subst .,_,${CURL_VERSION})/curl-$(CURL_VERSION).zip"
 	unzip $(CURL_DIR)/src/curl.zip -d $(CURL_DIR)/src/.