From 5211cf5a3e103470f6d969a6435da63a17ae8517 Mon Sep 17 00:00:00 2001
From: Stefano D'Angelo <stefano.dangelo@orastron.com>
Date: Mon, 17 Mar 2025 16:49:08 +0100
Subject: [PATCH] update to latest android sdk stuff + allow building android
 app on non-linux

---
 templates/android-make/Makefile | 16 ++++++++++++++--
 test/vars-pre.mk                |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/templates/android-make/Makefile b/templates/android-make/Makefile
index 27f950e..6cd0223 100644
--- a/templates/android-make/Makefile
+++ b/templates/android-make/Makefile
@@ -50,8 +50,20 @@ KOTLIN_STDLIB_FILE := $(KOTLIN_DIR)/kotlin-stdlib-$(KOTLIN_STDLIB_VERSION).jar
 KOTLINX_COROUTINES_CORE_FILE := $(KOTLIN_DIR)/kotlinx-coroutines-core-$(KOTLINX_COROUTINES_CORE_VERSION).jar
 KOTLINX_COROUTINES_CORE_JVM_FILE := $(KOTLIN_DIR)/kotlinx-coroutines-core-jvm-$(KOTLINX_COROUTINES_CORE_JVM_VERSION).jar
 
-CC := $(NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi$(MIN_API)-clang
-CXX := $(NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi$(MIN_API)-clang++
+ifeq ($(OS), Windows_NT)
+	VST3_PLATFORM := x86_64-win
+	NDK_BIN_DIR ?= $(NDK_DIR)/toolchains/llvm/prebuilt/windows-x86_64/bin/
+else
+	UNAME_S := $(shell uname -s)
+	ifeq ($(UNAME_S), Darwin)
+		NDK_BIN_DIR ?= $(NDK_DIR)/toolchains/llvm/prebuilt/darwin-x86_64/bin/
+	else
+		NDK_BIN_DIR ?= $(NDK_DIR)/toolchains/llvm/prebuilt/linux-x86_64/bin/
+	endif
+endif
+
+CC := $(NDK_BIN_DIR)/armv7a-linux-androideabi$(MIN_API)-clang
+CXX := $(NDK_BIN_DIR)/armv7a-linux-androideabi$(MIN_API)-clang++
 JC := javac
 
 APKSIGNER := $(BUILD_TOOLS_DIR)/apksigner
diff --git a/test/vars-pre.mk b/test/vars-pre.mk
index badff9b..d08ab18 100644
--- a/test/vars-pre.mk
+++ b/test/vars-pre.mk
@@ -29,9 +29,9 @@ ifeq ($(TEMPLATE), android)
 	SDK_DIR := $(HOME)/Android/Sdk
 	ANDROIDX_DIR := $(HOME)/Android/androidx
 	KOTLIN_DIR := $(HOME)/Android/kotlin
-	NDK_VERSION := 28.0.12674087
-	BUILD_TOOLS_VERSION := 35.0.0
-	ANDROID_VERSION := 35
+	NDK_VERSION := 28.0.13004108
+	BUILD_TOOLS_VERSION := 36.0.0
+	ANDROID_VERSION := 36
 	ANDROIDX_CORE_VERSION := 1.15.0
 	ANDROIDX_LIFECYCLE_COMMON_VERSION := 2.8.7
 	ANDROIDX_VERSIONEDPARCELABLE_VERSION := 1.2.1