Fix NDK filename for newer NDK versions.

Author: Alexhuszagh

docker/android-ndk.sh

@@ -6,8 +6,16 @@ set -euo pipefail
 # shellcheck disable=SC1091
 . lib.sh
 
-NDK_PLATFORM=linux-x86_64
-NDK_FILENAME="android-ndk-${ANDROID_NDK}-${NDK_PLATFORM}.zip"
+NDK_OS=linux
+NDK_PLATFORM="${NDK_OS}-x86_64"
+# format is r21d, r25b, etc.
+NDK_VERSION="${ANDROID_NDK:1:2}"
+# android NDK 23 and higher moved from `linux-x86_64` to `linux`
+if [[ "${NDK_VERSION}" -ge 23 ]]; then
+    NDK_FILENAME="android-ndk-${ANDROID_NDK}-${NDK_OS}.zip"
+else
+    NDK_FILENAME="android-ndk-${ANDROID_NDK}-${NDK_PLATFORM}.zip"
+fi
 NDK_URL="https://dl.google.com/android/repository/${NDK_FILENAME}"
 
 main() {