From bb36afc390a7208ebebd402a53d3416d1325690a Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Wed, 24 Jul 2024 11:20:35 -0400 Subject: [PATCH] Use android ndk r27 (LTS) if available. --- GNUmakefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index c2f859b0..d6c0ef47 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -63,7 +63,11 @@ ANDROID_MIN_SDK_VERSION := 24 ANDROID_TARGET_SDK_VERSION := 34 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0 ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION) +ifneq "$(wildcard $(ANDROID_SDK)/ndk/27.0.12077973/.)" "" +ANDROID_NDK ?= $(ANDROID_SDK)/ndk/27.0.12077973 +else ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342 +endif ANDROID_ARMV7A_TARGETS := \ out/androiddebug-armv7a/tildefriends \ @@ -914,7 +918,7 @@ fetchdeps: ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a $(ANDROID_DEPS): - +@tools/ssl-android + +@ANDROID_NDK_ROOT=$(ANDROID_NDK) tools/ssl-android $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS) ifeq ($(HAVE_WIN),1)