android fix new line and arch in tests

Author: Gioee

.github/workflows/main.yml

@@ -126,7 +126,7 @@ jobs:
           cat > commands.sh << EOF
             mv -f /data/local/tmp/sqlite3 /system/xbin
             cd /data/local/tmp
-            $(make test CC=$CC PLATFORM=$PLATFORM -n)
+            $(make test CC=$CC PLATFORM=$PLATFORM ARCH=$ARCH -n)
           EOF
           echo "::endgroup::"
 

Makefile

@@ -75,32 +75,35 @@ else ifeq ($(PLATFORM),android)
     ifeq ($(filter %,$(ARCH)),)
         $(error "Android ARCH must be set to ARCH=x86_64 or ARCH=arm64-v8a")
     endif
+
+    HOST = $(shell uname -s)
+    BIN = $$ANDROID_NDK/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin
 
     ifeq ($(ARCH),x86_64)
         define CURL_CONFIG
-        --host x86_64-linux-android26
-        --with-openssl=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
-        LIBS="-lssl -lcrypto"
-        AR=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
-        AS=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
-        CC=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang
-        CXX=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android26-clang++
-        LD=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
-        RANLIB=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
-        STRIP=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+        --host x86_64-$(HOST)-android26 \
+        --with-openssl=$$ANDROID_NDK/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr \
+        LIBS="-lssl -lcrypto" \
+        AR=$(BIN)/llvm-ar \
+        AS=$(BIN)/llvm-as \
+        CC=$(BIN)/x86_64-linux-android26-clang \
+        CXX=$(BIN)/x86_64-linux-android26-clang++ \
+        LD=$(HOST)/ld \
+        RANLIB=$(HOST)/llvm-ranlib \
+        STRIP=$(HOST)/llvm-strip \
         endef
     else ifeq ($(ARCH),arm64-v8a)
         define CURL_CONFIG
-        --host aarch64-linux-android26
-        --with-openssl=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr
-        LIBS="-lssl -lcrypto"
-        AR=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
-        AS=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
-        CC=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang
-        CXX=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang++
-        LD=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
-        RANLIB=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
-        STRIP=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip
+        --host aarch64-linux-android26 \
+        --with-openssl=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr \
+        LIBS="-lssl -lcrypto" \
+        AR=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar \
+        AS=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as \
+        CC=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang \
+        CXX=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang++ \
+        LD=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/ld \
+        RANLIB=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib \
+        STRIP=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip \
         endef
     else
         $(error "Unsupported Android ARCH: $(ARCH)")