Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the gradle NDK version for the legacy Android build and parallelize

Browse Source 
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.
This commit is contained in:
Henrik Rydgård committed 2026-08-03 12:00:13 +02:00
1 parent db30fabf03
commit c66e5a26bd
3 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/workflows/build.yml
+5 -5
View File
@@ -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'
android/ab.cmd
+2 -2
View File
@@ -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% %*
android/ab.sh
+1 -1
View File
@@ -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) $*