Skip to content

Commit 7b84676

Browse files
committed
android define curl config inline
1 parent d2d8c1b commit 7b84676

File tree

1 file changed

+2
-24
lines changed

1 file changed

+2
-24
lines changed

Makefile

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -80,31 +80,9 @@ else ifeq ($(PLATFORM),android)
8080
BIN = $$ANDROID_NDK/toolchains/llvm/prebuilt/$(HOST)-x86_64/bin
8181

8282
ifeq ($(ARCH),x86_64)
83-
define CURL_CONFIG
84-
--host x86_64-$(HOST)-android26 \
85-
--with-openssl=$$ANDROID_NDK/toolchains/llvm/prebuilt/$(HOST)-x86_64/sysroot/usr \
86-
LIBS="-lssl -lcrypto" \
87-
AR=$(BIN)/llvm-ar \
88-
AS=$(BIN)/llvm-as \
89-
CC=$(BIN)/x86_64-linux-android26-clang \
90-
CXX=$(BIN)/x86_64-linux-android26-clang++ \
91-
LD=$(HOST)/ld \
92-
RANLIB=$(HOST)/llvm-ranlib \
93-
STRIP=$(HOST)/llvm-strip \
94-
endef
83+
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
9584
else ifeq ($(ARCH),arm64-v8a)
96-
define CURL_CONFIG
97-
--host aarch64-linux-android26 \
98-
--with-openssl=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr \
99-
LIBS="-lssl -lcrypto" \
100-
AR=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar \
101-
AS=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as \
102-
CC=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang \
103-
CXX=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android26-clang++ \
104-
LD=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/ld \
105-
RANLIB=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib \
106-
STRIP=$$ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip \
107-
endef
85+
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
10886
else
10987
$(error "Unsupported Android ARCH: $(ARCH)")
11088
endif

0 commit comments

Comments
 (0)