Hi, I found that the variable JAVA_VERSION_INFO_RESOURCE gets defined in make/launcher/LauncherCommon.gmk, while it is only used in make/launcher/Launcher-java.base.gmk for the java and javaw launchers. I thought it would make sense to move its definition into Launcher-java.base.gmk to keep it more local and ease the understanding of the make files. Do you agree? If yes, a change would look like this:
diff -r 22f8fe08bbe1 make/launcher/Launcher-java.base.gmk --- a/make/launcher/Launcher-java.base.gmk Mon Mar 11 09:31:51 2019 +0100 +++ b/make/launcher/Launcher-java.base.gmk Mon Mar 11 09:32:30 2019 +0100 @@ -27,6 +27,8 @@ $(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk)) +JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc + JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/common JAVA_RC_FLAGS += -I$(TOPDIR)/src/java.base/windows/native/launcher/icons diff -r 22f8fe08bbe1 make/launcher/LauncherCommon.gmk --- a/make/launcher/LauncherCommon.gmk Mon Mar 11 09:31:51 2019 +0100 +++ b/make/launcher/LauncherCommon.gmk Mon Mar 11 09:32:30 2019 +0100 @@ -51,7 +51,6 @@ -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \ # GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc -JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest I didn't open a bug for the change yet, as I wanted to get some opinions first. Thanks & Best regards Christoph