From 3263e09ea316e4ad35e8d4d3e76b727be0d9e1ea Mon Sep 17 00:00:00 2001
From: Daniel Elliott <ssfdre38@msn.com>
Date: Thu, 19 Feb 2026 13:05:22 -0800
Subject: [PATCH] Fix Android 16 installation with extractNativeLibs=true

- Set extractNativeLibs=true to bypass 16KB alignment requirement
- Lower targetSDK to 34 for compatibility mode
- Update RR3-Community-Mod.ps1 with 16KB zipalign command
- Tested on Android 16 (API 36)

Issue: apksigner 0.9 breaks 16KB alignment when signing
Solution: Extract libs to disk instead of mmap

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 AndroidManifest.xml   | 2 +-
 RR3-Community-Mod.ps1 | 5 +++--
 apktool.yml           | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c03f21334..fffa8ef4a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -77,7 +77,7 @@
     <uses-permission android:name="com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE"/>
     <permission android:name="com.ea.games.r3_row.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION" android:protectionLevel="signature"/>
     <uses-permission android:name="com.ea.games.r3_row.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"/>
-    <application android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:banner="@string/icon_name_tv_row" android:dataExtractionRules="@xml/backup_android12" android:extractNativeLibs="false" android:fullBackupContent="@xml/backup_legacy" android:hardwareAccelerated="true" android:icon="@string/icon_name_row" android:isGame="true" android:label="@string/app_name" android:largeHeap="true" android:localeConfig="@xml/locale_config" android:name="androidx.multidex.MultiDexApplication" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="false" android:roundIcon="@string/icon_name_round_row" android:screenOrientation="sensorLandscape" android:supportsRtl="true" android:theme="@style/splashScreenTheme" android:usesCleartextTraffic="false" android:windowSoftInputMode="adjustNothing">
+    <application android:appComponentFactory="androidx.core.app.CoreComponentFactory" android:banner="@string/icon_name_tv_row" android:dataExtractionRules="@xml/backup_android12" android:extractNativeLibs="true" android:fullBackupContent="@xml/backup_legacy" android:hardwareAccelerated="true" android:icon="@string/icon_name_row" android:isGame="true" android:label="@string/app_name" android:largeHeap="true" android:localeConfig="@xml/locale_config" android:name="androidx.multidex.MultiDexApplication" android:networkSecurityConfig="@xml/network_security_config" android:resizeableActivity="false" android:roundIcon="@string/icon_name_round_row" android:screenOrientation="sensorLandscape" android:supportsRtl="true" android:theme="@style/splashScreenTheme" android:usesCleartextTraffic="false" android:windowSoftInputMode="adjustNothing">
         <!-- ServerSelectionActivity: Community Edition server/mode selector (optional) -->
         <activity android:exported="false" android:name="com.firemint.realracing.ServerSelectionActivity" android:screenOrientation="sensorLandscape" android:theme="@style/splashScreenTheme"/>
         <!-- UnpackAssetsActivity: No longer the launcher, now called by MainActivity -->
diff --git a/RR3-Community-Mod.ps1 b/RR3-Community-Mod.ps1
index 0d9a132df..1fbd3c29a 100644
--- a/RR3-Community-Mod.ps1
+++ b/RR3-Community-Mod.ps1
@@ -158,11 +158,12 @@ if ($uberSigner) {
         exit 1
     }
     
-    # Zipalign
+    # Zipalign with 16KB page alignment for Android 15+ (API 35+)
     $zipalign = Get-Command zipalign -ErrorAction SilentlyContinue
     if ($zipalign) {
         $alignedApk = $OutputPath -replace '\.apk$', '-aligned.apk'
-        & zipalign -v 4 $OutputPath $alignedApk 2>&1 | Out-Null
+        # Use -p flag for 16KB page alignment (required for Android 15+)
+        & zipalign -p -f -v 16 $OutputPath $alignedApk 2>&1 | Out-Null
         Move-Item -Path $alignedApk -Destination $OutputPath -Force
     }
 }
diff --git a/apktool.yml b/apktool.yml
index 860a4ee1b..765da1e69 100644
--- a/apktool.yml
+++ b/apktool.yml
@@ -7,7 +7,7 @@ usesFramework:
   tag: null
 sdkInfo:
   minSdkVersion: 26
-  targetSdkVersion: 36
+  targetSdkVersion: 34
 packageInfo:
   forcedPackageId: 127
   renameManifestPackage: null