Skip to content

Commit 056ca1c

Browse files
committed
android dynamic curl config
1 parent b77a02b commit 056ca1c

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,7 @@ else ifeq ($(PLATFORM),android)
8383
override ARCH := aarch64
8484
endif
8585

86-
ifeq ($(ARCH),x86_64)
87-
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=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip
88-
else ifeq ($(ARCH),aarch64)
89-
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
90-
else
91-
$(error "Unsupported Android ARCH: $(ARCH)")
92-
endif
93-
86+
CURL_CONFIG = --host $(ARCH)-$(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)/$(ARCH)-linux-android26-clang CXX=$(BIN)/$(ARCH)-linux-android26-clang++ LD=$(BIN)/ld RANLIB=$(BIN)/llvm-ranlib STRIP=$(BIN)/llvm-strip
9487
TARGET := $(DIST_DIR)/cloudsync.so
9588
LDFLAGS += -shared -lcrypto -lssl
9689
else ifeq ($(PLATFORM),ios)

0 commit comments

Comments
 (0)