From a84a58b6133e9c5d7af93bc73dff0eb794be9b6a Mon Sep 17 00:00:00 2001
From: OpenSauce04 <opensauce04@gmail.com>
Date: Mon, 29 Dec 2025 00:12:19 +0000
Subject: [PATCH] ci: Added build job for Android Google Play flavor

---
 .ci/android.sh              | 10 ++++++++--
 .github/workflows/build.yml | 12 ++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.ci/android.sh b/.ci/android.sh
index db3dac419..fc945e243 100755
--- a/.ci/android.sh
+++ b/.ci/android.sh
@@ -9,8 +9,14 @@ fi
 
 cd src/android
 chmod +x ./gradlew
-./gradlew assembleRelease
-./gradlew bundleRelease
+
+if [[ "$TARGET" == "googleplay" ]]; then
+    ./gradlew assembleGooglePlayRelease
+    ./gradlew bundleGooglePlayRelease
+else
+    ./gradlew assembleVanillaRelease
+    ./gradlew bundleVanillaRelease
+fi
 
 ccache -s -v
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 918db8532..766326e70 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -221,12 +221,16 @@ jobs:
 
   android:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        target: ["vanilla", "googleplay"]
     env:
       CCACHE_DIR: ${{ github.workspace }}/.ccache
       CCACHE_COMPILERCHECK: content
       CCACHE_SLOPPINESS: time_macros
       OS: android
-      TARGET: universal
+      TARGET: ${{ matrix.target }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -238,16 +242,16 @@ jobs:
             ~/.gradle/caches
             ~/.gradle/wrapper
             ${{ env.CCACHE_DIR }}
-          key: ${{ runner.os }}-android-${{ github.sha }}
+          key: ${{ runner.os }}-${{ env.OS }}-${{ matrix.target }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-android-
+            ${{ runner.os }}-${{ env.OS }}-${{ matrix.target }}-
       - name: Set tag name
         run: |
           if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
               echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
           fi
           echo $GIT_TAG_NAME
-      - name: Deps
+      - name: Install tools
         run: |
           sudo apt-get update -y
           sudo apt-get install ccache apksigner -y