From ab0df93de44f392cdf230c5cf4b51cb9a2efedef Mon Sep 17 00:00:00 2001
From: Starlightbotanist <starlightbotanist@gmail.com>
Date: Tue, 28 Jul 2026 15:52:22 -0400
Subject: [PATCH 1/2] Android: Disable native heap pointer tagging for core
 compatibility

Targeting Android API 30 or higher enables native heap pointer tagging for the RetroArch process, causing Flycast's ARM64 native code to crash when launching content.

Target SDK 29 works, while targets 30 and 36 crash. Setting allowNativeHeapPointerTagging to false resolves the crash at both targets.

Libretro cores execute inside the RetroArch process, so apply Android's documented compatibility opt-out while affected native core code is updated for tagged-pointer compatibility.
---
 pkg/android/phoenix/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
index 512a404331b..37bb4d39e3b 100644
--- a/pkg/android/phoenix/AndroidManifest.xml
+++ b/pkg/android/phoenix/AndroidManifest.xml
@@ -16,7 +16,7 @@
     <!-- Android 6-12 -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
-    <application
+    <application android:allowNativeHeapPointerTagging="false"
         android:name="com.retroarch.playcore.RetroArchApplication"
         android:allowAudioPlaybackCapture="true"
         android:allowBackup="true"

From d344aa23f09905ef71567c9323b6eb78a52a690f Mon Sep 17 00:00:00 2001
From: Starlightbotanist <starlightbotanist@gmail.com>
Date: Tue, 28 Jul 2026 16:17:06 -0400
Subject: [PATCH 2/2] Fix formatting of allowNativeHeapPointerTagging attribute

---
 pkg/android/phoenix/AndroidManifest.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
index 37bb4d39e3b..ca8b446e1c7 100644
--- a/pkg/android/phoenix/AndroidManifest.xml
+++ b/pkg/android/phoenix/AndroidManifest.xml
@@ -16,7 +16,8 @@
     <!-- Android 6-12 -->
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
-    <application android:allowNativeHeapPointerTagging="false"
+    <application
+	android:allowNativeHeapPointerTagging="false"
         android:name="com.retroarch.playcore.RetroArchApplication"
         android:allowAudioPlaybackCapture="true"
         android:allowBackup="true"