Update Android NDK, bump Android API level from 34 to 35, support 16K…

… page sizes on Android
CasualPokePlayer · Nov 30, 2024 · 52a2d26 · 52a2d26
1 parent c77955c
commit 52a2d26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.ci/android.sh b/.ci/android.sh
@@ -19,9 +19,9 @@ mv $HOME/cmdline-tools $ANDROID_HOME/cmdline-tools/latest
 
 # Install Android SDK and NDK
 yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
-$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-34"
-$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "ndk;26.2.11394342"
-$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "cmake;3.22.1"
+$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-35"
+$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "ndk;27.2.12479018"
+$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "cmake;3.31.0"
 
 export ANDROID_NDK_ROOT="$ANDROID_HOME/ndk/26.2.11394342"
 export PATH=$ANDROID_HOME/cmake/3.22.1/bin:$PATH

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -4,13 +4,13 @@ plugins {
 
 android {
     namespace = "org.psr.gse"
-    compileSdk = 34
-	ndkVersion = "26.2.11394342" // current NDK LTS
+    compileSdk = 35
+    ndkVersion = "27.2.12479018" // current NDK LTS
 
     defaultConfig {
         applicationId = "org.psr.gsr" // kept as .gsr rather than .gse for backwards compatibility
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
 
         versionName = getGitVersion()
         versionCode = getBuildVersionCode()

diff --git a/externals/android/build_all.bat b/externals/android/build_all.bat
@@ -29,6 +29,7 @@ cmake ..\..\%~1 ^
 	-DANDROID_ABI=%~3 ^
 	-DANDROID_PLATFORM=android-21 ^
 	-DANDROID_STL=c++_shared ^
+	-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON ^
 	-DCMAKE_BUILD_TYPE=Release ^
 	-DGSE_SHARED=ON ^
 	-G Ninja

diff --git a/externals/android/build_all.sh b/externals/android/build_all.sh
@@ -15,6 +15,7 @@ CMakeNinjaBuildAbi() {
 		-DANDROID_ABI=$3 \
 		-DANDROID_PLATFORM=android-21 \
 		-DANDROID_STL=c++_shared \
+		-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DGSE_SHARED=ON \
 		-G Ninja