RFR: 8329086: Clean up java.desktop native compilation

Magnus Ihse Bursie ihse at openjdk.org
Tue Mar 26 23:07:22 UTC 2024


On Tue, 26 Mar 2024 19:25:47 GMT, Phil Race <prr at openjdk.org> wrote:

>> This is a follow-up on [JDK-8328680](https://bugs.openjdk.org/browse/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.
>
> make/modules/java.desktop/lib/Awt2dLibraries.gmk line 145:
> 
>> 143:         -delayload:gdi32.dll -delayload:imm32.dll -delayload:ole32.dll \
>> 144:         -delayload:shell32.dll -delayload:shlwapi.dll -delayload:user32.dll \
>> 145:         -delayload:winmm.dll -delayload:winspool.drv, \
> 
> I suppose (presume?) that delayload isn't sensitive to the order ?
> But I do have to ask if you ran all the client automated tests, as well as making sure builds work ?
> And surely logical ordering related to dependencies is more important than lexical sort order ?

`/delayload` is not order sensitive, no.

I'm not sure what you mean by "logical ordering related to dependencies". All these are dependencies for awt.dll, and there is no intra-dependency relation between them.

What you see here is just a single file -- I have gone through the entire build system to make sure all calls to `SetupJdkLibrary` has been consistent. Among the things I have standardized is making sure that all libraries are listed in alphabetical order. It will not affect the final product but will help us keep the makefile source code clean and consistent.

> make/modules/java.desktop/lib/Awt2dLibraries.gmk line 161:
> 
>> 159:     LIBS_windows := advapi32.lib comctl32.lib comdlg32.lib delayimp.lib \
>> 160:         gdi32.lib imm32.lib kernel32.lib ole32.lib shell32.lib shlwapi.lib \
>> 161:         user32.lib uuid.lib winmm.lib winspool.lib, \
> 
> same as above, I don't think sort oder is what is important here.

It is not important for awt.dll. It is important in the context of all other calls to SetupJdkLibrary.

-------------

PR Review Comment: https://git.openjdk.org/jdk/pull/18486#discussion_r1540212163
PR Review Comment: https://git.openjdk.org/jdk/pull/18486#discussion_r1540213657


More information about the build-dev mailing list