changeset 47314:743814386712

8188814: Simplify IncludeCustomExtension Reviewed-by: dholmes
author ihse
date Thu, 05 Oct 2017 12:41:06 +0200
parents eb28be8f935d
children 31f541df4187
files make/Bundles.gmk make/CompileDemos.gmk make/CompileJavaModules.gmk make/CompileToolsHotspot.gmk make/CompileToolsJdk.gmk make/Docs.gmk make/Images.gmk make/Jprt.gmk make/Main.gmk make/ReleaseFile.gmk make/RunTests.gmk make/SourceRevision.gmk make/ToolsJdk.gmk make/UpdateBuildDocs.gmk make/ZipSource.gmk make/autoconf/spec.gmk.in make/common/FindTests.gmk make/common/MakeBase.gmk make/common/Modules.gmk make/copy/Copy-java.base.gmk make/copy/Copy-java.desktop.gmk make/gendata/Gendata-java.base.gmk make/gendata/GendataBlacklistedCerts.gmk make/gendata/GendataFontConfig.gmk make/gensrc/Gensrc-java.desktop.gmk make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk make/gensrc/Gensrc-jdk.localedata.gmk make/gensrc/GensrcIcons.gmk make/hotspot/gensrc/GenerateSources.gmk make/hotspot/gensrc/GensrcAdlc.gmk make/hotspot/gensrc/GensrcJvmti.gmk make/hotspot/lib/CompileGtest.gmk make/hotspot/lib/CompileJvm.gmk make/hotspot/lib/JvmFeatures.gmk make/hotspot/lib/JvmMapfile.gmk make/hotspot/lib/JvmOverrideFiles.gmk make/launcher/Launcher-java.base.gmk make/launcher/Launcher-java.desktop.gmk make/lib/Awt2dLibraries.gmk make/lib/CoreLibraries.gmk make/lib/Lib-java.instrument.gmk make/lib/Lib-java.management.gmk make/lib/Lib-jdk.hotspot.agent.gmk make/lib/Lib-jdk.management.gmk make/lib/LibCommon.gmk make/test/JtregNativeHotspot.gmk make/test/JtregNativeJdk.gmk
diffstat 47 files changed, 52 insertions(+), 53 deletions(-) [+]
line wrap: on
line diff
--- a/make/Bundles.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/Bundles.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -40,7 +40,7 @@
 endif
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Bundles-pre.gmk))
+$(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
 ################################################################################
 # BUNDLE : Name of bundle to create
 # FILES : Files in BASE_DIRS to add to bundle
@@ -322,7 +322,7 @@
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Bundles.gmk))
+$(eval $(call IncludeCustomExtension, Bundles.gmk))
 
 ################################################################################
 
--- a/make/CompileDemos.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/CompileDemos.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -303,7 +303,7 @@
 
 ################################################################################
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , CompileDemos.gmk))
+$(eval $(call IncludeCustomExtension, CompileDemos.gmk))
 
 all: $(TARGETS)
 images: $(IMAGES_TARGETS)
--- a/make/CompileJavaModules.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/CompileJavaModules.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -33,7 +33,7 @@
 include SetupJavaCompilers.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , CompileJavaModules.gmk))
+$(eval $(call IncludeCustomExtension, CompileJavaModules.gmk))
 
 ################################################################################
 # Module specific build settings
@@ -689,7 +689,7 @@
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
+$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
 
 ################################################################################
 
--- a/make/CompileToolsHotspot.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/CompileToolsHotspot.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -35,7 +35,7 @@
 TARGETS :=
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , hotspot/CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/CompileTools.gmk))
 
 ifeq ($(INCLUDE_GRAAL), true)
   VM_CI_SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.ci/share/classes
--- a/make/CompileToolsJdk.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/CompileToolsJdk.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -32,7 +32,7 @@
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, CompileTools.gmk))
 
 ################################################################################
 
--- a/make/Docs.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/Docs.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -37,7 +37,7 @@
 
 ################################################################################
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Docs.gmk))
+$(eval $(call IncludeCustomExtension, Docs.gmk))
 
 ################################################################################
 # This file generates all documentation for OpenJDK.
--- a/make/Images.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/Images.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -34,7 +34,7 @@
 JRE_TARGETS :=
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Images-pre.gmk))
+$(eval $(call IncludeCustomExtension, Images-pre.gmk))
 
 ############################################################################
 
@@ -426,7 +426,7 @@
 
 # Include custom post hook here to make it possible to augment the target lists
 # before actual target prerequisites are declared.
-$(eval $(call IncludeCustomExtension, , Images-post.gmk))
+$(eval $(call IncludeCustomExtension, Images-post.gmk))
 
 ################################################################################
 
--- a/make/Jprt.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/Jprt.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -104,4 +104,4 @@
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , Jprt.gmk))
+$(eval $(call IncludeCustomExtension, Jprt.gmk))
--- a/make/Main.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/Main.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -51,7 +51,7 @@
 ALL_TARGETS :=
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Main.gmk))
+$(eval $(call IncludeCustomExtension, Main.gmk))
 
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
--- a/make/ReleaseFile.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/ReleaseFile.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -80,7 +80,7 @@
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , ReleaseFile.gmk))
+$(eval $(call IncludeCustomExtension, ReleaseFile.gmk))
 
 ################################################################################
 
--- a/make/RunTests.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/RunTests.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -36,7 +36,7 @@
 JTREG_TEST_TOPDIRS := $(TOPDIR) $(JTREG_TESTROOTS)
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , RunTests.gmk))
+$(eval $(call IncludeCustomExtension, RunTests.gmk))
 
 TEST_RESULTS_DIR := $(OUTPUTDIR)/test-results
 TEST_SUPPORT_DIR := $(OUTPUTDIR)/test-support
--- a/make/SourceRevision.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/SourceRevision.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -28,7 +28,7 @@
 include $(SPEC)
 include MakeBase.gmk
 
-$(eval $(call IncludeCustomExtension, , SourceRevision.gmk))
+$(eval $(call IncludeCustomExtension, SourceRevision.gmk))
 
 ################################################################################
 # Keep track of what source revision is used to create the build, by creating
--- a/make/ToolsJdk.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/ToolsJdk.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -29,7 +29,7 @@
 include JavaCompilation.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Tools.gmk))
+$(eval $(call IncludeCustomExtension, Tools.gmk))
 
 ################################################################################
 # To avoid reevaluating the compilation setup for the tools each time this file
--- a/make/UpdateBuildDocs.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/UpdateBuildDocs.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -63,7 +63,7 @@
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , UpdateBuildDocs.gmk))
+$(eval $(call IncludeCustomExtension, UpdateBuildDocs.gmk))
 
 ################################################################################
 
--- a/make/ZipSource.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/ZipSource.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -33,7 +33,7 @@
 SRC_ZIP_WORK_DIR := $(SUPPORT_OUTPUTDIR)/src
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , ZipSource.gmk))
+$(eval $(call IncludeCustomExtension, ZipSource.gmk))
 
 ################################################################################
 # Create the directory structure for src.zip using symlinks.
--- a/make/autoconf/spec.gmk.in	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/autoconf/spec.gmk.in	Thu Oct 05 12:41:06 2017 +0200
@@ -847,9 +847,8 @@
 # This macro is called to allow inclusion of closed source counterparts.
 # Unless overridden in closed sources, it expands to nothing.
 # Usage: This function is called in an open makefile, with the following
-# arguments:
-# $1 the name of the repo, or empty if the top-level repo.
-# $2 the name of the makefile
+# argument:
+# $1 the name of the makefile
 define IncludeCustomExtension
 endef
 
--- a/make/common/FindTests.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/common/FindTests.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -27,7 +27,7 @@
 _FIND_TESTS_GMK := 1
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , common/FindTests.gmk))
+$(eval $(call IncludeCustomExtension, common/FindTests.gmk))
 
 # JTREG_TESTROOTS might have been set by a custom extension
 JTREG_TESTROOTS += $(addprefix $(TOPDIR)/test/, hotspot/jtreg jdk langtools nashorn jaxp)
--- a/make/common/MakeBase.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/common/MakeBase.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -991,6 +991,6 @@
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
+$(eval $(call IncludeCustomExtension, common/MakeBase.gmk))
 
 endif # _MAKEBASE_GMK
--- a/make/common/Modules.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/common/Modules.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -43,7 +43,7 @@
 DOCS_MODULES :=
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , common/Modules.gmk))
+$(eval $(call IncludeCustomExtension, common/Modules.gmk))
 
 BOOT_MODULES += \
     java.base \
--- a/make/copy/Copy-java.base.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/copy/Copy-java.base.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, , copy/Copy-java.base.gmk))
+$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
 
 ################################################################################
 #
--- a/make/copy/Copy-java.desktop.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/copy/Copy-java.desktop.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, , copy/Copy-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))
 
 ################################################################################
 
--- a/make/gendata/Gendata-java.base.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gendata/Gendata-java.base.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include GendataCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , gendata/Gendata-java.base.gmk))
+$(eval $(call IncludeCustomExtension, gendata/Gendata-java.base.gmk))
 
 include GendataBreakIterator.gmk
 
--- a/make/gendata/GendataBlacklistedCerts.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gendata/GendataBlacklistedCerts.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , gendata/GendataBlacklistedCerts.gmk))
+$(eval $(call IncludeCustomExtension, gendata/GendataBlacklistedCerts.gmk))
 
 GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
 GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs
--- a/make/gendata/GendataFontConfig.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gendata/GendataFontConfig.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , gendata/GendataFontConfig.gmk))
+$(eval $(call IncludeCustomExtension, gendata/GendataFontConfig.gmk))
 
 GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
 
--- a/make/gensrc/Gensrc-java.desktop.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gensrc/Gensrc-java.desktop.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, gensrc/Gensrc-java.desktop.gmk))
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
--- a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -28,7 +28,7 @@
 include $(SPEC)
 include MakeBase.gmk
 
-$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
+$(eval $(call IncludeCustomExtension, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
 
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
 SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
--- a/make/gensrc/Gensrc-jdk.localedata.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gensrc/Gensrc-jdk.localedata.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.localedata.gmk))
+$(eval $(call IncludeCustomExtension, gensrc/Gensrc-jdk.localedata.gmk))
 
 include GensrcLocaleData.gmk
 include GensrcCLDR.gmk
--- a/make/gensrc/GensrcIcons.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/gensrc/GensrcIcons.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , gensrc/GensrcIcons.gmk))
+$(eval $(call IncludeCustomExtension, gensrc/GensrcIcons.gmk))
 
 GENSRC_AWT_ICONS :=
 GENSRC_AWT_ICONS_SRC :=
--- a/make/hotspot/gensrc/GenerateSources.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/gensrc/GenerateSources.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -39,7 +39,7 @@
 include gensrc/GensrcDtrace.gmk
 include gensrc/GensrcJvmti.gmk
 
-$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GenerateSources.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/gensrc/GenerateSources.gmk))
 
 # While technically the rules below are "gendata" which can be done in parallel
 # with native compilation, let's keep it here for simplicity.
--- a/make/hotspot/gensrc/GensrcAdlc.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GensrcAdlc.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/gensrc/GensrcAdlc.gmk))
 
 ifeq ($(call check-jvm-feature, compiler2), true)
 
--- a/make/hotspot/gensrc/GensrcJvmti.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GensrcJvmti.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/gensrc/GensrcJvmti.gmk))
 
 ################################################################################
 # Build tools needed for the JVMTI source code generation
--- a/make/hotspot/lib/CompileGtest.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/lib/CompileGtest.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileGtest.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/lib/CompileGtest.gmk))
 
 GTEST_TEST_SRC += $(TOPDIR)/test/hotspot/gtest
 GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp
--- a/make/hotspot/lib/CompileJvm.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/lib/CompileJvm.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -28,7 +28,7 @@
 include lib/JvmFeatures.gmk
 include lib/JvmOverrideFiles.gmk
 
-$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileJvm.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/lib/CompileJvm.gmk))
 
 ################################################################################
 # Setup compilation of the main Hotspot native library (libjvm).
--- a/make/hotspot/lib/JvmFeatures.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/lib/JvmFeatures.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmFeatures.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/lib/JvmFeatures.gmk))
 
 ################################################################################
 # Setup CFLAGS and EXCLUDES for the libjvm compilation, depending on which
--- a/make/hotspot/lib/JvmMapfile.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/lib/JvmMapfile.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmMapfile.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/lib/JvmMapfile.gmk))
 
 ################################################################################
 # Combine a list of static symbols
--- a/make/hotspot/lib/JvmOverrideFiles.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmOverrideFiles.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/lib/JvmOverrideFiles.gmk))
 
 ################################################################################
 # This file contains explicit overrides of CFLAGS and/or precompiled header
--- a/make/launcher/Launcher-java.base.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/launcher/Launcher-java.base.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -25,7 +25,7 @@
 
 include LauncherCommon.gmk
 
-$(eval $(call IncludeCustomExtension, , launcher/Launcher-java.base.gmk))
+$(eval $(call IncludeCustomExtension, launcher/Launcher-java.base.gmk))
 
 JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/common
 JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
--- a/make/launcher/Launcher-java.desktop.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/launcher/Launcher-java.desktop.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include LauncherCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , launcher/Launcher-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, launcher/Launcher-java.desktop.gmk))
 
 ifeq ($(ENABLE_HEADLESS_ONLY), false)
   $(eval $(call SetupBuildLauncher, appletviewer, \
--- a/make/lib/Awt2dLibraries.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/Awt2dLibraries.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries-pre.gmk))
+$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries-pre.gmk))
 
 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
 
@@ -1070,4 +1070,4 @@
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries.gmk))
+$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
--- a/make/lib/CoreLibraries.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/CoreLibraries.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/CoreLibraries.gmk))
+$(eval $(call IncludeCustomExtension, lib/CoreLibraries.gmk))
 
 
 ##########################################################################################
--- a/make/lib/Lib-java.instrument.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/Lib-java.instrument.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/Lib-java.instrument.gmk))
+$(eval $(call IncludeCustomExtension, lib/Lib-java.instrument.gmk))
 
 ################################################################################
 
--- a/make/lib/Lib-java.management.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/Lib-java.management.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/Lib-java.management.gmk))
+$(eval $(call IncludeCustomExtension, lib/Lib-java.management.gmk))
 
 ################################################################################
 
--- a/make/lib/Lib-jdk.hotspot.agent.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -25,7 +25,7 @@
 
 include NativeCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, , hotspot/lib/Lib-jdk.hotspot.agent.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/lib/Lib-jdk.hotspot.agent.gmk))
 
 ################################################################################
 
--- a/make/lib/Lib-jdk.management.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/Lib-jdk.management.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/Lib-jdk.management.gmk))
+$(eval $(call IncludeCustomExtension, lib/Lib-jdk.management.gmk))
 
 ################################################################################
 
--- a/make/lib/LibCommon.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/lib/LibCommon.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -26,7 +26,7 @@
 include NativeCompilation.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/LibCommon.gmk))
+$(eval $(call IncludeCustomExtension, lib/LibCommon.gmk))
 
 ################################################################################
 
--- a/make/test/JtregNativeHotspot.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/test/JtregNativeHotspot.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -35,7 +35,7 @@
 include MakeBase.gmk
 include TestFilesCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, , hotspot/test/JtregNative.gmk))
+$(eval $(call IncludeCustomExtension, hotspot/test/JtregNative.gmk))
 
 ################################################################################
 # Targets for building the native tests themselves.
--- a/make/test/JtregNativeJdk.gmk	Thu Oct 05 11:02:18 2017 +0200
+++ b/make/test/JtregNativeJdk.gmk	Thu Oct 05 12:41:06 2017 +0200
@@ -35,7 +35,7 @@
 include MakeBase.gmk
 include TestFilesCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, , test/JtregNative.gmk))
+$(eval $(call IncludeCustomExtension, test/JtregNative.gmk))
 
 ################################################################################
 # Targets for building the native tests themselves.