From 81e5f31401e7e26cb3677248eedafc921bf14b05 Mon Sep 17 00:00:00 2001
From: Damontecres <damontecres@gmail.com>
Date: Wed, 27 May 2026 13:56:18 -0400
Subject: [PATCH] Workaround for resource shrinking w/ split ABIs

---
 .github/workflows/release.yml |  4 ++--
 app/build.gradle.kts          | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 54b4418e..b0520630 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,8 +36,8 @@ jobs:
           ORG_GRADLE_PROJECT_WholphinExtensionsUsername: "${{ secrets.EXTENSIONS_USERNAME }}"
           ORG_GRADLE_PROJECT_WholphinExtensionsPassword: "${{ secrets.EXTENSIONS_PASSWORD }}"
         run: |
-          ./gradlew clean assembleDefaultRelease bundleAppstoreRelease bundleFiretvRelease --no-daemon
-
+          ./gradlew clean bundleAppstoreRelease bundleFiretvRelease
+          ./gradlew assembleDefaultRelease
       - name: Verify signatures
         run: |
           echo "Verify APK signatures"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f18a4afb..e7230f0c 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -27,6 +27,12 @@ val av1ModuleExists = project.file("libs/lib-decoder-av1-release.aar").exists()
 val mpvModuleExists = project.file("libs/wholphin-mpv-release.aar").exists()
 val extensionsRepoActive = project.hasProperty("WholphinExtensionsUsername")
 
+// See https://issuetracker.google.com/issues/402800800
+val isBuildingBundle =
+    providers.provider {
+        gradle.startParameter.taskNames.any { it.lowercase().contains("bundle") }
+    }
+
 val gitTags =
     providers
         .exec { commandLine("git", "tag", "--list", "v*", "p*") }
@@ -156,7 +162,9 @@ configure<ApplicationExtension> {
 
     splits {
         abi {
-            isEnable = true
+            // Disable split abis when building bundles
+            isEnable = !isBuildingBundle.get()
+
             reset()
             include("armeabi-v7a", "arm64-v8a")
             isUniversalApk = true