android fix lowercase uname -s

Author: Gioee

Makefile

@@ -76,12 +76,16 @@ else ifeq ($(PLATFORM),android)
         $(error "Android ARCH must be set to ARCH=x86_64 or ARCH=arm64-v8a")
     endif
 
-    HOST = $(shell uname -s)
+    HOST = $(shell uname -s | tr '[:upper:]' '[:lower:]')
     BIN = $$ANDROID_NDK/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin
+
+    ifneq (,$(filter $(ARCH),arm64 arm64-v8a))
+        ARCH = aarch64
+    endif
 
     ifeq ($(ARCH),x86_64)
         CURL_CONFIG = --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
-    else ifeq ($(ARCH),arm64-v8a)
+    else ifeq ($(ARCH),aarch64)
         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
     else
         $(error "Unsupported Android ARCH: $(ARCH)")