[3.15] gh-152785: Upgrade Java from 17 to 21 in GHA Android (GH-152783) (#152920)

Upgrade Java from 17 to 21 in GHA Android, and document the Java version
requirement.
(cherry picked from commit 0a13efc3fb0bf0896612ed20decce3ce4eb5e05b)

Co-authored-by: Victor Stinner <vstinner@python.org>

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 89be2d9c8ed84de08ebb51d0d126e6304ac1bfdf..362db498eb6c2c100b19292e19287ef9a8ebec02 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -401,7 +401,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