Enhance Android PR CI with Concurrent JDK Matrix (#4301)

* Enhance Android PR CI to run concurrently with JDK 8, 11, 17, 21, and 25.

- Updated `.github/workflows/scripts-android.yml` to use a matrix strategy for JDK versions.
- Modified `scripts/build-android-app.sh` and `scripts/run-android-instrumentation-tests.sh` to respect `JDK_HOME` env var.
- Updated `scripts/lib/cn1ss.sh` to support failing on screenshot mismatch and skipping PR comments via env vars `CN1SS_FAIL_ON_MISMATCH` and `CN1SS_SKIP_COMMENT`.
- Configured matrix jobs to fail on mismatch and skip comments for non-default JDKs.

* Update Android PR CI matrix to run on Default: 8, 17, and 21.

- Renamed 'current' matrix entry to 'Default: 8'.
- Removed JDK 11 and 25 from the matrix as requested.
- Updated conditional logic to skip artifact uploads (screenshots, coverage) for non-default runs to prevent conflicts.
- Updated test runner script block to skip coverage generation for non-default runs.
- Preserved existing logic for JDK setup and env vars for non-default runs.

* Fix Android PR CI Matrix logic and artifacts.

- Refactored matrix to use `include` with `id`, `name`, and `java_version` to avoid string quoting issues and provide robust logic.
- Removed JDK 11 and 25 from the matrix as requested.
- Updated conditional logic to use `matrix.id` for checking default vs. custom jobs.
- Fixed artifact conflict by strictly limiting uploads to the `default` job using the robust `matrix.id == 'default'` check.
- Added explicit job name `Build Android ${{ matrix.name }}` for better visibility in PR checks.

* Fix syntax error in Android PR workflow and simplify coverage logic.

- Removed malformed shell script block in `scripts-android.yml` that caused syntax errors in the emulator runner.
- Moved logic to skip coverage report generation into `run-android-instrumentation-tests.sh` using the `CN1SS_SKIP_COVERAGE` env var.
- Updated workflow to set `CN1SS_SKIP_COVERAGE=1` for non-default matrix jobs.
- Simplified `android-emulator-runner` script input to a single line command.

* Fix Android emulator disk space issue by cleaning up runner.

- Added "Free Disk Space" step for non-default matrix jobs to remove unused large packages (dotnet, ndk, ghc, swift) and prevent `Not enough space to create userdata partition` errors during emulator creation.
- Verified that `mvnw` Java version mismatch is non-blocking for the build process.

* Updated screenshots

---------

Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Co-authored-by: Shai Almog <[email protected]>

Author: google-labs-jules[bot]

.github/workflows/scripts-android.yml

@@ -72,6 +72,19 @@ name: Test Android build scripts
 
 jobs:
   build-android:
+    name: Build Android ${{ matrix.name }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: "Default: 8"
+            id: default
+          - name: "JDK 17"
+            id: jdk17
+            java_version: '17'
+          - name: "JDK 21"
+            id: jdk21
+            java_version: '21'
     permissions:
       contents: read
       pull-requests: write
@@ -82,6 +95,28 @@ jobs:
       GH_TOKEN: ${{ secrets.CN1SS_GH_TOKEN }}
     steps:
       - uses: actions/checkout@v4
+      - name: Free Disk Space
+        if: matrix.id != 'default'
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /usr/local/lib/android/sdk/ndk
+          sudo rm -rf /opt/ghc
+          sudo rm -rf /usr/share/swift
+      - name: Setup JDK
+        if: matrix.id != 'default'
+        uses: actions/setup-java@v4
+        with:
+          java-version: ${{ matrix.java_version }}
+          distribution: 'zulu'
+      - name: Set JDK_HOME
+        if: matrix.id != 'default'
+        run: echo "JDK_HOME=${JAVA_HOME}" >> $GITHUB_ENV
+      - name: Configure CN1SS options
+        if: matrix.id != 'default'
+        run: |
+          echo "CN1SS_SKIP_COMMENT=1" >> $GITHUB_ENV
+          echo "CN1SS_FAIL_ON_MISMATCH=1" >> $GITHUB_ENV
+          echo "CN1SS_SKIP_COVERAGE=1" >> $GITHUB_ENV
       - name: Setup workspace
         run: ./scripts/setup-workspace.sh -q -DskipTests
       - name: Build Android port
@@ -100,11 +135,9 @@ jobs:
           api-level: 31
           arch: x86_64
           target: google_apis
-          script: |
-            ./scripts/run-android-instrumentation-tests.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"
-            ./scripts/generate-android-coverage-report.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"
+          script: ./scripts/run-android-instrumentation-tests.sh "${{ steps.build-android-app.outputs.gradle_project_dir }}"
       - name: Upload emulator screenshot
-        if: always()   # still collect it if tests fail
+        if: always() && matrix.id == 'default'
         uses: actions/upload-artifact@v4
         with:
           name: emulator-screenshot
@@ -113,7 +146,7 @@ jobs:
           retention-days: 14
           compression-level: 6
       - name: Upload Android Jacoco coverage report
-        if: always()
+        if: always() && matrix.id == 'default'
         uses: actions/upload-artifact@v4
         with:
           name: android-jacoco-coverage

scripts/android/screenshots/GraphicsPipeline.png

@@ -131,9 +131,9 @@ if [ ! -f "$PATCH_GRADLE_SOURCE_PATH/$PATCH_GRADLE_MAIN_CLASS.java" ]; then
   exit 1
 fi
 
-PATCH_GRADLE_JAVA="${JAVA17_HOME}/bin/java"
+PATCH_GRADLE_JAVA="${JDK_HOME:-$JAVA17_HOME}/bin/java"
 if [ ! -x "$PATCH_GRADLE_JAVA" ]; then
-  ba_log "JDK 17 java binary missing at $PATCH_GRADLE_JAVA" >&2
+  ba_log "JDK java binary missing at $PATCH_GRADLE_JAVA" >&2
   exit 1
 fi
 
@@ -151,7 +151,7 @@ echo "---------------------------------"
 ba_log "Invoking Gradle build in $GRADLE_PROJECT_DIR"
 chmod +x "$GRADLE_PROJECT_DIR/gradlew"
 ORIGINAL_JAVA_HOME="$JAVA_HOME"
-export JAVA_HOME="$JAVA17_HOME"
+export JAVA_HOME="${JDK_HOME:-$JAVA17_HOME}"
 (
   cd "$GRADLE_PROJECT_DIR"
   if command -v sdkmanager >/dev/null 2>&1; then