8329086: Clean up java.desktop native compilation

[magicus]

This is a follow-up on JDK-8328680, making the same kind of cleanup to java.desktop. Some code needed more special treatment here, so there is some additional effects outside of the modules/java.desktop directory. The code was also in worse shape than other modules, so some additional changes to the build logic where needed.

---

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-8329086: Clean up java.desktop native compilation (Bug - P3)

Reviewers

• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18486

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back ihse! 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]

@magicus 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:

8329086: Clean up java.desktop native compilation

Reviewed-by: erikj

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 15 new commits pushed to the master branch:

• d0a2650: 8324774: Add DejaVu web fonts
• 37a5a08: 8329102: Clean up jdk.jpackage native compilation
• 788d2bc: 8329169: Parallel: Remove unused local variable in MutableSpace::print_on
• 4dfcc6d: 8329115: Crash involving return from inner switch
• 9e566d7: 8327971: Multiple ASAN errors reported for metaspace
• 8fc9097: 8315575: Retransform of record class with record component annotation fails with CFE
• 2725405: 8327991: Improve HttpClient documentation with regard to reclaiming resources
• db01fcd: 8328827: Convert java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html applet test to main
• 89e0889: 8328858: More runtime/stack tests fail intermittently on libgraal
• 153410f: 8328930: [AIX] remove pase related coding
• ... and 5 more: https://git.openjdk.org/jdk/compare/9d441e3e56e733d64dbadde6854761e4545c1c70...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.

[openjdk]

@magicus The following labels will be automatically applied to this pull request:

• build
• client

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

[magicus]

If the total PR is hard to read, I recommend reviewing this by looking at each individual commit instead. I've tried to make them simple and explain what I'm doing.

[magicus]

/label -client

[openjdk]

@magicus
The client label was successfully removed.

[mlbridge]

Webrevs

• 02: Full - Incremental (0931034f)
• 01: Full - Incremental (b7e31071)
• 00: Full (ad8b1a5f)

[magicus]

As usual, I have run COMPARE_BUILD on Oracle CI to be able to study the differences. As before, I believe all differences are due to the reordering of libraries to link with.

For Windows, the changes were larger in some libraries than usual, so I conducted a more thorough investigation. I have verified that the command lines to compile and link are essentially unchanged (except for ordering of command line flags). I believe the use of -delayload in libawt and libsplashscreen was the cause for the larger-than-usual changes in the resulting dll files.

(I also incidentally discovered JDK-8329107 when I was scrutinizing the command lines...)

[magicus]

For the record: I have run the client testing that @prrace recommended me (in an offline conversation), and there are no failures.

[magicus]

/integrate

[openjdk]

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

• d0a2650: 8324774: Add DejaVu web fonts
• 37a5a08: 8329102: Clean up jdk.jpackage native compilation
• 788d2bc: 8329169: Parallel: Remove unused local variable in MutableSpace::print_on
• 4dfcc6d: 8329115: Crash involving return from inner switch
• 9e566d7: 8327971: Multiple ASAN errors reported for metaspace
• 8fc9097: 8315575: Retransform of record class with record component annotation fails with CFE
• 2725405: 8327991: Improve HttpClient documentation with regard to reclaiming resources
• db01fcd: 8328827: Convert java/awt/print/PrinterJob/PrinterDialogsModalityTest/PrinterDialogsModalityTest.html applet test to main
• 89e0889: 8328858: More runtime/stack tests fail intermittently on libgraal
• 153410f: 8328930: [AIX] remove pase related coding
• ... and 5 more: https://git.openjdk.org/jdk/compare/9d441e3e56e733d64dbadde6854761e4545c1c70...master

Your commit was automatically rebased without conflicts.

[openjdk]

@magicus Pushed as commit d292aab.

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