Android NDK -> 28.0.13004108

Author: danoli3

.github/workflows/build-android.yml

@@ -43,13 +43,12 @@ jobs:
       matrix:
         ARCH: [armv7, arm64, x86_64]
         SDK: ["35.0.0"]
-        NDK: ["27.2.12479018"] #"26.3.11579264",
+        NDK: ["28.0.13004108"]
         API: ["24"]
     env:
       ARCH: ${{ matrix.ARCH }}
       SDK: ${{ matrix.SDK }}
       NDK: ${{ matrix.NDK }}
-      NDK_ROOT: ${{ matrix.NDK }}
       ANDROID_API: ${{ matrix.API }}
     steps:
       - uses: actions/checkout@v4.2.2

apothecary/configure/android_configure.sh

@@ -19,7 +19,15 @@ export ANDROID_ABI=$1
 export BUILD_SYSTEM=${2:-make}
 
 export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/android"
-export NDK_ROOT="${ANDROID_NDK_ROOT}"
+
+if [ "${NDK:-}" == "27.2.12479018" ]; then 
+    export NDK_ROOT="${ANDROID_NDK_ROOT:-}"
+elif [ "${NDK:-}" == "28.0.13004108" ]; then 
+    export NDK_ROOT="${ANDROID_NDK_LATEST_HOME:-}"
+else
+    echo "Error: NDK path variable not set" >&2
+    exit 1
+fi
 
 export HOST_ARCH=$(uname -m)
 case "$(uname)" in

apothecary/toolchains/android.toolchain.cmake

@@ -24,11 +24,11 @@ if(NOT DEFINED ANDROID_ABI)
     endif()
 endif()
 
-if(NOT DEFINED ANDROID_NDK_ROOT)
-    if(DEFINED ENV{ANDROID_NDK_ROOT})
-        set(ANDROID_NDK_ROOT $ENV{ANDROID_NDK_ROOT})
+if(NOT DEFINED NDK_ROOT)
+    if(DEFINED ENV{NDK_ROOT})
+        set(NDK_ROOT $ENV{NDK_ROOT})
     else()
-        message(FATAL_ERROR "ANDROID_NDK_ROOT must be specified as the path to the Android NDK")
+        message(FATAL_ERROR "NDK_ROOT must be specified as the path to the Android NDK")
     endif()
 endif()