On Wed, 16 Dec 2020 13:51:50 GMT, Magnus Ihse Bursie <i...@openjdk.org> wrote:
>> The update to JRE_MODULES in Images.gmk resolves my comment above. However, >> the naming for the configuration is still a bit odd, e.g. >> module-sets-classloaders.conf should be something like >> module-loader-map.conf as used to generate ModuleLoaderMap.java in the build. > > @AlanBateman I don't have a problem with renaming the conf files, I just did > not know what you wanted them to be called. :-) I renamed > `module-sets-classloaders.conf` to `module-loader-map.conf`. Based on this, I > rename the other two files `javadoc-modules.conf` and > `build-module-sets.conf`, respectively. I hope this is okay. Otherwise, > please just let me know what you think they should be called. Thanks for the update. javadoc-modules.conf is probably okay although someone finding this in the repo might initially think it's the configuration for the javadoc modules. That plus it sets DOCS_MODULES, so maybe it should be apidocs-modules.conf. module-loader-map.conf works as the configuration file that defines BOOT_MODULES and PLATFORM_MODULES. I think AGGREGATOR_MODULES should be dropped and "java.se" added to PLATFORM_MODULES. If I remember correctly, this was separated out in JDK 9 and 10 because of the java.se.ee aggregator module (that one was removed in Java 11 by JEP 320). We should probably look at UPGRADEABLE_MODULES while we are here. This is the modules that are overriddable by way of excluding from the hashes stored in java.base (CreateJmods.gmk). I think it's okay to leave it in module-loader-map.conf because these modules are mapped to the platform class loader. Could we just rename it to UPGRADEABLE_PLATFORM_MODULES so that its a bit clearer (in Modules.gmk) as to why they are append to PLATFORM_MODULES? ------------- PR: https://git.openjdk.java.net/jdk/pull/1781
