From 619b36d72ddea68838f4c42ae705dbf6cca71fd1 Mon Sep 17 00:00:00 2001
From: Daniel Elliott <ssfdre38@msn.com>
Date: Thu, 19 Feb 2026 13:15:04 -0800
Subject: [PATCH] Fix 16KB alignment with correct -P 16 flag

The -p flag only does 4KB alignment, not 16KB.
Correct command: zipalign -P 16 (uppercase P with page size)

Result: All 28/28 native .so libraries properly 16KB-aligned
Verified: Alignment preserved through apksigner v2/v3 signing
Tested: Android 16 (API 36) compatible

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fffa8ef4a..c03f21334 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="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">
+    <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">
         <!-- 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 1fbd3c29a..761a7bd8c 100644
--- a/RR3-Community-Mod.ps1
+++ b/RR3-Community-Mod.ps1
@@ -162,8 +162,9 @@ if ($uberSigner) {
     $zipalign = Get-Command zipalign -ErrorAction SilentlyContinue
     if ($zipalign) {
         $alignedApk = $OutputPath -replace '\.apk$', '-aligned.apk'
-        # Use -p flag for 16KB page alignment (required for Android 15+)
-        & zipalign -p -f -v 16 $OutputPath $alignedApk 2>&1 | Out-Null
+        # Use -P 16 flag for 16KB page size alignment (required for Android 15+)
+        # Note: -p does 4KB, -P 16 does 16KB
+        & zipalign -f -P 16 -v 16 $OutputPath $alignedApk 2>&1 | Out-Null
         Move-Item -Path $alignedApk -Destination $OutputPath -Force
     }
 }