From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 3 Jul 2026 02:56:16 +0000 (+0200)
Subject: [3.15] gh-152785: Upgrade Java from 17 to 21 in GHA Android (GH-152783) (#152920)
X-Git-Tag: v3.15.0b4~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c09f078796c4eb31679b1c5960bfab584277bb09;p=thirdparty%2FPython%2Fcpython.git

[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 89be2d9c8ed8..362db498eb6c 100644
--- 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 d6f95c365c63..54b7f1c46a59 100644
--- 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