From c66e5a26bd4d87acde80b8e08de09342fe1784e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 3 Aug 2026 11:45:53 +0200
Subject: [PATCH] Use the gradle NDK version for the legacy Android build and
 parallelize

The legacy android/jni build (ab.sh / ab.cmd / CI) used an ancient NDK
(r21e) and hardcoded job counts. Update it to the NDK version used by the
gradle build (29.0.14206865) and derive the job count from the available
cores (nproc / NUMBER_OF_PROCESSORS) instead of hardcoding.
---
 .github/workflows/build.yml | 10 +++++-----
 android/ab.cmd              |  4 ++--
 android/ab.sh               |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 925cefd16e..42560a7578 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -186,25 +186,25 @@ jobs:
           extra: android
           cc: clang
           cxx: clang++
-          args: cd android && ./ab.sh -j2 APP_ABI=arm64-v8a UNITTEST=1 HEADLESS=1
+          args: cd android && ./ab.sh APP_ABI=arm64-v8a UNITTEST=1 HEADLESS=1
           id: android-arm64
         - os: ubuntu-26.04
           extra: android
           cc: clang
           cxx: clang++
-          args: cd android && ./ab.sh -j2 APP_ABI=armeabi-v7a UNITTEST=1 HEADLESS=1
+          args: cd android && ./ab.sh APP_ABI=armeabi-v7a UNITTEST=1 HEADLESS=1
           id: android-arm32
         - os: ubuntu-26.04
           extra: android
           cc: clang
           cxx: clang++
-          args: cd android && ./ab.sh -j2 APP_ABI=x86_64 UNITTEST=1 HEADLESS=1
+          args: cd android && ./ab.sh APP_ABI=x86_64 UNITTEST=1 HEADLESS=1
           id: android-x86_64
         - os: ubuntu-26.04
           extra: android
           cc: clang
           cxx: clang++
-          args: cd android && ./ab.sh -j2 APP_ABI=arm64-v8a OPENXR=1
+          args: cd android && ./ab.sh APP_ABI=arm64-v8a OPENXR=1
           id: android-vr
         - os: ubuntu-26.04
           extra: android
@@ -283,7 +283,7 @@ jobs:
       if: matrix.extra == 'android'
       id: setup-ndk
       with:
-        ndk-version: r21e
+        ndk-version: r29
 
     - name: Install Linux dependencies
       if: runner.os == 'Linux' && matrix.extra != 'android' && matrix.extra != 'loongarch64'
diff --git a/android/ab.cmd b/android/ab.cmd
index 06f21acfaf..6d955f625a 100644
--- a/android/ab.cmd
+++ b/android/ab.cmd
@@ -10,7 +10,7 @@ copy ..\assets\*.png assets\
 copy ..\assets\*.zim assets\
 copy ..\assets\*.meta assets\
 copy ..\assets\*.wav assets\
-SET NDK=C:\Android\sdk\ndk\21.3.6528147
+SET NDK=C:\Android\sdk\ndk\29.0.14206865
 REM SET NDK=C:\Android\ndk
 SET NDK_MODULE_PATH=..\ext
-%NDK%/ndk-build -j32 %*
+%NDK%/ndk-build -j%NUMBER_OF_PROCESSORS% %*
diff --git a/android/ab.sh b/android/ab.sh
index 7960da08e8..3e3d5de418 100755
--- a/android/ab.sh
+++ b/android/ab.sh
@@ -12,4 +12,4 @@ cp ../assets/*.png assets/
 cp ../assets/*.zim assets/
 cp ../assets/*.meta assets/
 cp ../assets/*.wav assets/
-NDK_MODULE_PATH=../ext $NDK/ndk-build -j3 $*
+NDK_MODULE_PATH=../ext $NDK/ndk-build -j$(nproc 2>/dev/null || echo 4) $*