From 14a802b58bd6ab5af03b2b855c86c35e6d6e87bb Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 28 Sep 2024 12:08:01 +0200 Subject: [PATCH] Android: Add 16 KiB page size support So far, Dolphin hasn't been able to run on Android devices that use a 16 KiB page size. 16 KiB page sizes are a very new Android feature that no phones have shipped with so far, so we're still compatible with the phones that exist out there, but let's get this fixed before phones start shipping with 16 KiB page sizes. Because I couldn't get Android Studio's emulator to work, I haven't been able to confirm that this change actually makes Dolphin fully compatible with devices that use a 16 KiB page size. But I have confirmed that this doesn't break anything on a regular 4 KiB page size device. --- Externals/libadrenotools | 2 +- Source/Android/app/build.gradle.kts | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Externals/libadrenotools b/Externals/libadrenotools index f4ce3c9618..8fae8ce254 160000 --- a/Externals/libadrenotools +++ b/Externals/libadrenotools @@ -1 +1 @@ -Subproject commit f4ce3c9618e7ecfcdd238b17dad9a0b888f5de90 +Subproject commit 8fae8ce254dfc1344527e05301e43f37dea2df80 diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts index af48026a86..0ed29fde4b 100644 --- a/Source/Android/app/build.gradle.kts +++ b/Source/Android/app/build.gradle.kts @@ -101,8 +101,12 @@ android { defaultConfig { externalNativeBuild { cmake { - arguments("-DANDROID_STL=c++_static", "-DCMAKE_BUILD_TYPE=RelWithDebInfo") - // , "-DENABLE_GENERIC=ON" + arguments( + "-DANDROID_STL=c++_static", + "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + // , "-DENABLE_GENERIC=ON" + ) abiFilters("arm64-v8a", "x86_64") //, "armeabi-v7a", "x86" // Uncomment the line below if you don't want to build the C++ unit tests