gh-152785: Upgrade Java from 17 to 21 in GHA Android (#152783)

Upgrade Java from 17 to 21 in GHA Android, and document the Java version
requirement.

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5b320ffb11d8933f1cb934945f2a983b10d4772f..9ef98f556cb205b4153c8b249bd16c4b9ece3a56 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -354,7 +354,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Build and test
-        run: python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
+        run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" python3 Platforms/Android ci --fast-ci ${{ matrix.arch }}-linux-android
 
   build-ios:
     name: iOS

diff --git a/Platforms/Android/README.md b/Platforms/Android/README.md
index d6f95c365c63a0b450ce78abf12f7d0ae1e44c22..54b7f1c46a59db0c1d527531f3fff7ad4347092c 100644 (file)
--- a/Platforms/Android/README.md
+++ b/Platforms/Android/README.md
@@ -30,7 +30,8 @@ any packages it needs.
 The script also requires the following commands to be on the `PATH`:
 
 * `curl`
-* `java` (or set the `JAVA_HOME` environment variable)
+* `java` (or set the `JAVA_HOME` environment variable).
+  Java versions 17 and 21 are supported.
 
 ## Building