From 2c9fbb9931a3e065496c74db30906828ee06a13f Mon Sep 17 00:00:00 2001
From: Totto16 <tobiausgais@gmail.com>
Date: Wed, 5 Jun 2024 00:52:02 +0200
Subject: [PATCH 1/2] android: update to newest ndk 27 rc2 (beta2)

---
 .github/workflows/android.yml      | 2 +-
 platforms/android/app/build.gradle | 2 +-
 platforms/build-android.sh         | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 706ce4b8..502cb57f 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
         
       - name: Setup NDK
         run: | 
-          sdkmanager --install "ndk;27.0.11718014"
+          sdkmanager --install "ndk;27.0.11902837"
 
 
       - name: Build native libraries
diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
index f7b96c63..e51cbb3c 100644
--- a/platforms/android/app/build.gradle
+++ b/platforms/android/app/build.gradle
@@ -248,7 +248,7 @@ android {
     }
 
     compileSdkVersion 34
-    ndkVersion "27.0.11718014-rc1"
+    ndkVersion "27.0.11902837-rc1"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"
diff --git a/platforms/build-android.sh b/platforms/build-android.sh
index de05f724..515a96cf 100755
--- a/platforms/build-android.sh
+++ b/platforms/build-android.sh
@@ -4,8 +4,8 @@ set -e
 
 mkdir -p toolchains
 
-export NDK_VER_DOWNLOAD="r27-beta1"
-export NDK_VER_DESC="r27-beta1"
+export NDK_VER_DOWNLOAD="r27-beta2"
+export NDK_VER_DESC="r27-beta2"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"

From 09478feb62871e6001f69223465f27fcbe51745a Mon Sep 17 00:00:00 2001
From: Totto16 <tobiausgais@gmail.com>
Date: Wed, 5 Jun 2024 00:54:01 +0200
Subject: [PATCH 2/2] android: support 16KB page sizes (is used in newer
 android version, previously it was 4KB)

---
 platforms/android/app/jni/Application.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platforms/android/app/jni/Application.mk b/platforms/android/app/jni/Application.mk
index 60ddde9c..d7c04b07 100644
--- a/platforms/android/app/jni/Application.mk
+++ b/platforms/android/app/jni/Application.mk
@@ -6,4 +6,8 @@ APP_STL := c++_shared
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
 
 # used SDK number
-APP_PLATFORM=android-34
+APP_PLATFORM := android-34
+
+# support 16KB page sizes:
+# see: https://developer.android.com/guide/practices/page-sizes 
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true