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

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 8f4845e6d68c7cb5b64cc766cb5409bb502fec1e..da19df666eb9b9be0adfc6c59351c968b4d28df1 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -378,7 +378,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Build and test
-        run: ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
+        run: JAVA_HOME="${JAVA_HOME_21_X64:-$JAVA_HOME_21_arm64}" ./Android/android.py ci --fast-ci ${{ matrix.arch }}-linux-android
 
   build-ios:
     name: iOS

diff --git a/Android/README.md b/Android/README.md
index 0004f26e72b21c4c30f656207c9624849c149e52..0474bdf1a79147c6861f107329305efa86b4dcb3 100644 (file)
--- a/Android/README.md
+++ b/Android/README.md
@@ -31,7 +31,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