Skip to content

Bug 1785929 - Only select a JDK toolchain in the standalone build - #7705

Merged
rvandermeulen merged 2 commits into
mozilla:mainfrom
rvandermeulen:jvmtoolchain-standalone
Oct 31, 2026
Merged

rvandermeulen merged 2 commits into
mozilla:mainfrom
rvandermeulen:jvmtoolchain-standalone

Conversation

@rvandermeulen

Copy link
Copy Markdown
Contributor

In mozilla-central the conventions plugin sets the Java 17 target for every Android project, including these, so that the build can move to JDK 25 without also installing JDK 17, which jvmToolchain would require. The standalone build keeps its toolchain as before.

The m-c side is https://phabricator.services.mozilla.com/D338192, which carries this same change in its vendored copy until a re-vendor picks it up.

In mozilla-central the conventions plugin sets the Java 17 target for every Android project, including these,
so that the build can move to JDK 25 without also installing JDK 17, which `jvmToolchain` would require.
@rvandermeulen

Copy link
Copy Markdown
Contributor Author

/taskcluster ci full

@rvandermeulen

Copy link
Copy Markdown
Contributor Author

Note that I plan to update A-S to JDK 25 shortly after the bump lands on mozilla-central, so this is ultimately going to be a short-lived change.

@ahochheiden ahochheiden left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@rvandermeulen
rvandermeulen added this pull request to the merge queue Oct 31, 2026
Merged via the queue into mozilla:main with commit 38dd8e0 Oct 31, 2026
14 checks passed
@rvandermeulen
rvandermeulen deleted the jvmtoolchain-standalone branch October 31, 2026 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants