From ac8db3a98c185488c0473debc0f3415a148a3311 Mon Sep 17 00:00:00 2001
From: qimiko <25387744+qimiko@users.noreply.github.com>
Date: Fri, 19 Jan 2024 17:10:26 -0700
Subject: [PATCH] generate separate armv7 apk

---
 .github/workflows/build.yml | 17 ++++++++++++++---
 app/build.gradle            | 12 ++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 91b5e2e5..36c08b6d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,12 +33,21 @@ jobs:
           -Pandroid.injected.signing.key.alias="${{secrets.KEY_ALIAS}}" \
           -Pandroid.injected.signing.key.password="${{secrets.KEY_PASSWORD}}"
 
+    - name: Rename universal apk
+      id: rename_apk_universal
+      run: |
+        SHORT_SHA=${GITHUB_SHA::7}
+        APK_PATH=${{github.workspace}}/app/build/outputs/apk/debug/app-universal-debug.apk
+        OUT_PATH=${{github.workspace}}/geode-launcher-debug-$SHORT_SHA.apk
+        mv $APK_PATH $OUT_PATH
+        echo "path=$OUT_PATH" >> $GITHUB_OUTPUT
+
     - name: Rename apk
       id: rename_apk
       run: |
         SHORT_SHA=${GITHUB_SHA::7}
-        APK_PATH=${{github.workspace}}/app/build/outputs/apk/debug/app-debug.apk
-        OUT_PATH=${{github.workspace}}/geode-launcher-debug-$SHORT_SHA.apk
+        APK_PATH=${{github.workspace}}/app/build/outputs/apk/debug/app-armeabi-v7a-debug.apk
+        OUT_PATH=${{github.workspace}}/geode-launcher-debug-android32-$SHORT_SHA.apk
         mv $APK_PATH $OUT_PATH
         echo "path=$OUT_PATH" >> $GITHUB_OUTPUT
 
@@ -46,4 +55,6 @@ jobs:
       uses: actions/upload-artifact@v3
       with:
         name: geode-launcher-debug
-        path: ${{ steps.rename_apk.outputs.path }}
+        path: |
+          ${{ steps.rename_apk_universal.outputs.path }}
+          ${{ steps.rename_apk.outputs.path }}
diff --git a/app/build.gradle b/app/build.gradle
index 419f894f..58fce99c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,6 +26,18 @@ android {
         ndkConfig.abiFilters "arm64-v8a", "armeabi-v7a"
     }
 
+    splits {
+        abi {
+            enable true
+            reset()
+
+            //noinspection ChromeOsAbiSupport (not my fault)
+            include "arm64-v8a", "armeabi-v7a"
+
+            universalApk true
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false