8310384: Add hooks for custom image creation

[erikj79]

We have a need for creating custom variants of the JDK image and would like to be able to reuse the existing Images.gmk for doing so. To be able to do that, we need to define some variables that are suitable for overrides. Specifically, we need:

EXTRA_MODULES: a list of extra java module names to include in the "jdk" image.

EXTRA_JMODS_DIR: a list of extra directories to add to the module path and look for jmods in, ahead the default jmods dir.

JDK_IMAGE_SUPPORT_DIR: override the location of the support dir. Without overriding this, multiple calls to Images.gmk will overwrite each others intermediate files and dependency files.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8310384: Add hooks for custom image creation (Enhancement - P4)

Reviewers

• Mikael Vidstedt (@vidmik - Reviewer)
• Alan Bateman (@AlanBateman - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14563/head:pull/14563
$ git checkout pull/14563

Update a local copy of the PR:
$ git checkout pull/14563
$ git pull https://git.openjdk.org/jdk.git pull/14563/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14563

View PR using the GUI difftool:
$ git pr show -t 14563

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14563.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@erikj79 The following label will be automatically applied to this pull request:

• build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 01: Full - Incremental (8314e733)
• 00: Full (29d28234)

[AlanBateman]

Would --with-import-modules work for this requirement or is part of this overriding packages modules from the JDK ?

[erikj79]

Would --with-import-modules work for this requirement or is part of this overriding packages modules from the JDK ?

There is a case of overriding a module from the JDK, but this is also going to be part of the build itself, so the import module concept isn't flexible enough.

[openjdk]

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8310384: Add hooks for custom image creation

Reviewed-by: mikael, alanb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 27 new commits pushed to the master branch:

• 226c6a0: 8309883: no @since info in com.sun.tools.javac package-info.java, Main.java
• fd1163d: 8310332: Fix -Wconversion warnings in MethodData
• 72501cf: 8310379: Relax prerequisites for java.base-jmod target
• 59c6c0e: 8310335: JFR: Modernize collections and switch statements
• 826dcb5: 8264899: C1: -XX:AbortVMOnException does not work if all methods in the call stack are compiled with C1 and there are no exception handlers
• 658c337: 8309296: jdk/jfr/event/runtime/TestAgentEvent.java fails due to "missing" dynamic JavaAgent
• 70e1c92: 8310297: assert(static_cast(result) == thing) with ctw
• 574c6f0: 8310376: Extend SetupTarget macro with DIR parameter
• 7ea22cd: 8310369: UTIL_ARG_WITH fails when arg is disabled
• 01623f6: 8310133: Effectivelly final condition not enforced in guards for binding variables from the same case
• ... and 17 more: https://git.openjdk.org/jdk/compare/4ca548fe74419dc9e110489e3d2d3adf695ef37f...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[erikj79]

/integrate

[openjdk]

Going to push as commit 16a34e8.
Since your change was applied there have been 27 commits pushed to the master branch:

• 226c6a0: 8309883: no @since info in com.sun.tools.javac package-info.java, Main.java
• fd1163d: 8310332: Fix -Wconversion warnings in MethodData
• 72501cf: 8310379: Relax prerequisites for java.base-jmod target
• 59c6c0e: 8310335: JFR: Modernize collections and switch statements
• 826dcb5: 8264899: C1: -XX:AbortVMOnException does not work if all methods in the call stack are compiled with C1 and there are no exception handlers
• 658c337: 8309296: jdk/jfr/event/runtime/TestAgentEvent.java fails due to "missing" dynamic JavaAgent
• 70e1c92: 8310297: assert(static_cast(result) == thing) with ctw
• 574c6f0: 8310376: Extend SetupTarget macro with DIR parameter
• 7ea22cd: 8310369: UTIL_ARG_WITH fails when arg is disabled
• 01623f6: 8310133: Effectivelly final condition not enforced in guards for binding variables from the same case
• ... and 17 more: https://git.openjdk.org/jdk/compare/4ca548fe74419dc9e110489e3d2d3adf695ef37f...master

Your commit was automatically rebased without conflicts.

[openjdk]

@erikj79 Pushed as commit 16a34e8.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.