From 4d96d503f0fd7f6d8d03e9a666d864c459337b8a Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 20 Feb 2025 15:13:15 +0100
Subject: [PATCH] Try to go to the NDK directory containing "source.properties"

---
 dist-build/android-aar.sh   | 12 ++++++++++--
 dist-build/android-build.sh |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dist-build/android-aar.sh b/dist-build/android-aar.sh
index a51602f5..9808ed4e 100755
--- a/dist-build/android-aar.sh
+++ b/dist-build/android-aar.sh
@@ -12,6 +12,16 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
   exit 1
 fi
 
+if [ ! -f "${ANDROID_NDK_HOME}/source.properties" ]; then
+  sp=$(find "${ANDROID_NDK_HOME}" -depth 2 -type f -name source.properties | head -n1)
+  if [ -n "$sp" ]; then
+    export ANDROID_NDK_HOME=$(dirname "$sp")
+  else
+    echo "The ANDROID_NDK_HOME directory does not contain a 'source.properties' file."
+    exit 1
+  fi
+fi
+
 NDK_VERSION=$(grep "Pkg.Revision = " <"${ANDROID_NDK_HOME}/source.properties" | cut -f 2 -d '=' | cut -f 2 -d' ' | cut -f 1 -d'.')
 DEST_PATH=$(mktemp -d)
 
@@ -46,8 +56,6 @@ make_manifest() {
 }
 
 make_prefab_structure() {
-  mkdir "$DEST_PATH"
-
   for variant_dirs in "prefab" "prefab/modules" "META-INF"; do
     mkdir "${DEST_PATH}/${variant_dirs}"
   done
diff --git a/dist-build/android-build.sh b/dist-build/android-build.sh
index 04b1f210..daa0555c 100755
--- a/dist-build/android-build.sh
+++ b/dist-build/android-build.sh
@@ -28,7 +28,6 @@ fi
 export PREFIX="$(pwd)/libsodium-android-${TARGET_ARCH}"
 export TOOLCHAIN_OS_DIR="$(uname | tr '[:upper:]' '[:lower:]')-x86_64/"
 export TOOLCHAIN_DIR="$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/${TOOLCHAIN_OS_DIR}"
-echo "$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/${TOOLCHAIN_OS_DIR}/${HOST_COMPILER}"
 
 export PATH="${PATH}:${TOOLCHAIN_DIR}/bin"