From f38441465be676072a538bb099ceadb7e6acfa58 Mon Sep 17 00:00:00 2001
From: farfromrefuge <dev@akylas.fr>
Date: Thu, 6 Feb 2025 14:31:32 +0100
Subject: [PATCH] fix: ensure we build the runtime with the passed ndkVersion

* NDK_PATH would not follow ndkVersion if there was an env var ANDROID_NDK_HOME or ANDROID_NDK or ANDROID_NDK_ROOT
* cmake was not using the ndkVersion we were passing
---
 test-app/runtime/build.gradle | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test-app/runtime/build.gradle b/test-app/runtime/build.gradle
index e0816270..5c981666 100644
--- a/test-app/runtime/build.gradle
+++ b/test-app/runtime/build.gradle
@@ -56,7 +56,10 @@ if (!hasNdkDirectory) {
     NDK_PATH = ndkDirectory
 }
 
-if (NDK_PATH == null || NDK_PATH == "null" || NDK_PATH == "") {
+// if a ndkVersion is passed ensure we use it in NDK_PATH
+if (hasNdkVersion) {
+    NDK_PATH = "$System.env.ANDROID_HOME/ndk/${ndkVersion}"
+} else if (NDK_PATH == null || NDK_PATH == "null" || NDK_PATH == "") {
    if (!hasNdkVersion) {
         NDK_PATH = "$System.env.ANDROID_HOME/ndk/${defaultNdkVersion}"
    } else {
@@ -132,7 +135,7 @@ android {
 
 //              arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DANDROID_NDK_ROOT=${NDK_PATH}"
                 cppFlags "-std=c++17"
-                arguments "-DANDROID_STL=c++_shared", "-DANDROID_NDK_ROOT=${NDK_PATH}"
+                arguments "-DANDROID_STL=c++_shared", "-DANDROID_NDK_ROOT=${NDK_PATH}", "-DCMAKE_ANDROID_NDK=${NDK_PATH}", "-DCMAKE_TOOLCHAIN_FILE=${NDK_PATH}/build/cmake/android.toolchain.cmake"
             }
         }
 
@@ -388,4 +391,4 @@ def createPackageConfigFileTask(taskName) {
             }
         }
     }
-}
\ No newline at end of file
+}