android: detect when building app bundle

Author: MatusGuy

.github/workflows/android.yml

@@ -137,7 +137,6 @@ jobs:
 
           chmod +x ./gradlew
           ./gradlew assembleRelease \
-            -Pci=on \
             -Pcpuarch="${{ matrix.arch }}" \
             -Pcmake_args="-DGIT_HASH=$GIT_HASH;-DGIT_BRANCH=$GIT_BRANCH" \
             --info

mk/android/app/build.gradle

@@ -56,13 +56,13 @@ android {
         }
     }
 
-    if (!rootProject.ext.ci) {
-        // HACK: this just does not work on CI. whatever. it's meant for app bundles anyway.
+    if (rootProject.ext.bundle) {
         assetPacks = [":assetpack"]
-    }
-    sourceSets {
-        main {
-            assets.srcDirs += ['../assetpack/src/main/assets']
+    } else {
+        sourceSets {
+            main {
+                assets.srcDirs += ['../assetpack/src/main/assets']
+            }
         }
     }
 

mk/android/build.gradle

@@ -1,7 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
-// Is running in CI mode
-ext.ci = hasProperty("ci")
+for (String task : gradle.startParameter.getTaskNames()) {
+    if (task.startsWith("bundle")) {
+        ext.bundle = true
+        break
+    }
+}
 
 if (hasProperty("cpuarch")) {
     ext.cpuarch = property("cpuarch").split()