From 916902fb1afd841773c1d195aa4eb7eee1ff3bba Mon Sep 17 00:00:00 2001
From: ihse <unknown>
Date: Thu, 5 Oct 2017 12:41:06 +0200
Subject: [PATCH] 8188814: Simplify IncludeCustomExtension Reviewed-by: dholmes

---
 make/Bundles.gmk                                | 4 ++--
 make/CompileDemos.gmk                           | 2 +-
 make/CompileJavaModules.gmk                     | 4 ++--
 make/CompileToolsHotspot.gmk                    | 2 +-
 make/CompileToolsJdk.gmk                        | 2 +-
 make/Docs.gmk                                   | 2 +-
 make/Images.gmk                                 | 4 ++--
 make/Jprt.gmk                                   | 2 +-
 make/Main.gmk                                   | 2 +-
 make/ReleaseFile.gmk                            | 2 +-
 make/RunTests.gmk                               | 2 +-
 make/SourceRevision.gmk                         | 2 +-
 make/ToolsJdk.gmk                               | 2 +-
 make/UpdateBuildDocs.gmk                        | 2 +-
 make/ZipSource.gmk                              | 2 +-
 make/autoconf/spec.gmk.in                       | 5 ++---
 make/common/FindTests.gmk                       | 2 +-
 make/common/MakeBase.gmk                        | 2 +-
 make/common/Modules.gmk                         | 2 +-
 make/copy/Copy-java.base.gmk                    | 2 +-
 make/copy/Copy-java.desktop.gmk                 | 2 +-
 make/gendata/Gendata-java.base.gmk              | 2 +-
 make/gendata/GendataBlacklistedCerts.gmk        | 2 +-
 make/gendata/GendataFontConfig.gmk              | 2 +-
 make/gensrc/Gensrc-java.desktop.gmk             | 2 +-
 make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk | 2 +-
 make/gensrc/Gensrc-jdk.localedata.gmk           | 2 +-
 make/gensrc/GensrcIcons.gmk                     | 2 +-
 make/hotspot/gensrc/GenerateSources.gmk         | 2 +-
 make/hotspot/gensrc/GensrcAdlc.gmk              | 2 +-
 make/hotspot/gensrc/GensrcJvmti.gmk             | 2 +-
 make/hotspot/lib/CompileGtest.gmk               | 2 +-
 make/hotspot/lib/CompileJvm.gmk                 | 2 +-
 make/hotspot/lib/JvmFeatures.gmk                | 2 +-
 make/hotspot/lib/JvmMapfile.gmk                 | 2 +-
 make/hotspot/lib/JvmOverrideFiles.gmk           | 2 +-
 make/launcher/Launcher-java.base.gmk            | 2 +-
 make/launcher/Launcher-java.desktop.gmk         | 2 +-
 make/lib/Awt2dLibraries.gmk                     | 4 ++--
 make/lib/CoreLibraries.gmk                      | 2 +-
 make/lib/Lib-java.instrument.gmk                | 2 +-
 make/lib/Lib-java.management.gmk                | 2 +-
 make/lib/Lib-jdk.hotspot.agent.gmk              | 2 +-
 make/lib/Lib-jdk.management.gmk                 | 2 +-
 make/lib/LibCommon.gmk                          | 2 +-
 make/test/JtregNativeHotspot.gmk                | 2 +-
 make/test/JtregNativeJdk.gmk                    | 2 +-
 47 files changed, 52 insertions(+), 53 deletions(-)

diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 176e80782e..6dc3a6aa61 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -40,7 +40,7 @@ ifeq ($(OPENJDK_BUILD_OS), windows)
 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 @@ endif
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , Bundles.gmk))
+$(eval $(call IncludeCustomExtension, Bundles.gmk))
 
 ################################################################################
 
diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 0892f05df8..ded03581fc 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -303,7 +303,7 @@ endif
 
 ################################################################################
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , CompileDemos.gmk))
+$(eval $(call IncludeCustomExtension, CompileDemos.gmk))
 
 all: $(TARGETS)
 images: $(IMAGES_TARGETS)
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 327d139849..3c31fce7bc 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -33,7 +33,7 @@ include JavaCompilation.gmk
 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 @@ endif
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , CompileJavaModules-post.gmk))
+$(eval $(call IncludeCustomExtension, CompileJavaModules-post.gmk))
 
 ################################################################################
 
diff --git a/make/CompileToolsHotspot.gmk b/make/CompileToolsHotspot.gmk
index 48ac77afde..87d8bd5b3f 100644
--- a/make/CompileToolsHotspot.gmk
+++ b/make/CompileToolsHotspot.gmk
@@ -35,7 +35,7 @@ include SetupJavaCompilers.gmk
 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
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index e52a5eba60..78df6a68de 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -32,7 +32,7 @@ include SetupJavaCompilers.gmk
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, CompileTools.gmk))
 
 ################################################################################
 
diff --git a/make/Docs.gmk b/make/Docs.gmk
index 7b5bfcc9b7..eb40cfe1a1 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -37,7 +37,7 @@ $(eval $(call ReadImportMetaData))
 
 ################################################################################
 # 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.
diff --git a/make/Images.gmk b/make/Images.gmk
index 897d34f4e9..f6a740ecab 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -34,7 +34,7 @@ JDK_TARGETS :=
 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 @@ $(call SetupCopyDebuginfo,JRE)
 
 # 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))
 
 ################################################################################
 
diff --git a/make/Jprt.gmk b/make/Jprt.gmk
index 2370051f39..f205802950 100644
--- a/make/Jprt.gmk
+++ b/make/Jprt.gmk
@@ -104,4 +104,4 @@ ALL_TARGETS += jprt_bundle
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , Jprt.gmk))
+$(eval $(call IncludeCustomExtension, Jprt.gmk))
diff --git a/make/Main.gmk b/make/Main.gmk
index fd4ec0949c..e7a67d896b 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -51,7 +51,7 @@ include $(TOPDIR)/make/common/FindTests.gmk
 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)
diff --git a/make/ReleaseFile.gmk b/make/ReleaseFile.gmk
index f902c063de..00677030fa 100644
--- a/make/ReleaseFile.gmk
+++ b/make/ReleaseFile.gmk
@@ -80,7 +80,7 @@ TARGETS += $(BASE_RELEASE_FILE)
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , ReleaseFile.gmk))
+$(eval $(call IncludeCustomExtension, ReleaseFile.gmk))
 
 ################################################################################
 
diff --git a/make/RunTests.gmk b/make/RunTests.gmk
index 3b3975812b..d813138f28 100644
--- a/make/RunTests.gmk
+++ b/make/RunTests.gmk
@@ -36,7 +36,7 @@ include FindTests.gmk
 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
diff --git a/make/SourceRevision.gmk b/make/SourceRevision.gmk
index f4987cf467..10dd943d8b 100644
--- a/make/SourceRevision.gmk
+++ b/make/SourceRevision.gmk
@@ -28,7 +28,7 @@ default: all
 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
diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index 34be124a0b..4ac54f2619 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -29,7 +29,7 @@ _TOOLS_GMK := 1
 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
diff --git a/make/UpdateBuildDocs.gmk b/make/UpdateBuildDocs.gmk
index fe048999b0..51f7a6588c 100644
--- a/make/UpdateBuildDocs.gmk
+++ b/make/UpdateBuildDocs.gmk
@@ -63,7 +63,7 @@ TARGETS += $(testing)
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, , UpdateBuildDocs.gmk))
+$(eval $(call IncludeCustomExtension, UpdateBuildDocs.gmk))
 
 ################################################################################
 
diff --git a/make/ZipSource.gmk b/make/ZipSource.gmk
index 1e998c8f75..9b03ed98cd 100644
--- a/make/ZipSource.gmk
+++ b/make/ZipSource.gmk
@@ -33,7 +33,7 @@ include Modules.gmk
 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.
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 84babe101d..a4b5b43734 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -847,9 +847,8 @@ CONFIGURE_CMD := $(TOPDIR)/configure
 # 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
 
diff --git a/make/common/FindTests.gmk b/make/common/FindTests.gmk
index ffc711ae9a..1223638a43 100644
--- a/make/common/FindTests.gmk
+++ b/make/common/FindTests.gmk
@@ -27,7 +27,7 @@ ifndef _FIND_TESTS_GMK
 _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)
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 34e7c03219..582ed7c985 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -991,6 +991,6 @@ ColonList = \
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , common/MakeBase.gmk))
+$(eval $(call IncludeCustomExtension, common/MakeBase.gmk))
 
 endif # _MAKEBASE_GMK
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index f863310e95..047ad3c833 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -43,7 +43,7 @@ AGGREGATOR_MODULES :=
 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 \
diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk
index a6f004ebdf..affe27ce19 100644
--- a/make/copy/Copy-java.base.gmk
+++ b/make/copy/Copy-java.base.gmk
@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, , copy/Copy-java.base.gmk))
+$(eval $(call IncludeCustomExtension, copy/Copy-java.base.gmk))
 
 ################################################################################
 #
diff --git a/make/copy/Copy-java.desktop.gmk b/make/copy/Copy-java.desktop.gmk
index a40d65f1e5..b6682e2f29 100644
--- a/make/copy/Copy-java.desktop.gmk
+++ b/make/copy/Copy-java.desktop.gmk
@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, , copy/Copy-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, copy/Copy-java.desktop.gmk))
 
 ################################################################################
 
diff --git a/make/gendata/Gendata-java.base.gmk b/make/gendata/Gendata-java.base.gmk
index a55a3d79af..67e4776481 100644
--- a/make/gendata/Gendata-java.base.gmk
+++ b/make/gendata/Gendata-java.base.gmk
@@ -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
 
diff --git a/make/gendata/GendataBlacklistedCerts.gmk b/make/gendata/GendataBlacklistedCerts.gmk
index 0772a797ce..9eb183ad46 100644
--- a/make/gendata/GendataBlacklistedCerts.gmk
+++ b/make/gendata/GendataBlacklistedCerts.gmk
@@ -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
diff --git a/make/gendata/GendataFontConfig.gmk b/make/gendata/GendataFontConfig.gmk
index 1031bfba83..52ee37c188 100644
--- a/make/gendata/GendataFontConfig.gmk
+++ b/make/gendata/GendataFontConfig.gmk
@@ -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)
 
diff --git a/make/gensrc/Gensrc-java.desktop.gmk b/make/gensrc/Gensrc-java.desktop.gmk
index d28027d991..f58c437966 100644
--- a/make/gensrc/Gensrc-java.desktop.gmk
+++ b/make/gensrc/Gensrc-java.desktop.gmk
@@ -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
diff --git a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
index 059437db36..a6cfb3f059 100644
--- a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+++ b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
@@ -28,7 +28,7 @@ default: all
 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
diff --git a/make/gensrc/Gensrc-jdk.localedata.gmk b/make/gensrc/Gensrc-jdk.localedata.gmk
index 64e1fa9a07..137ce73e0f 100644
--- a/make/gensrc/Gensrc-jdk.localedata.gmk
+++ b/make/gensrc/Gensrc-jdk.localedata.gmk
@@ -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
diff --git a/make/gensrc/GensrcIcons.gmk b/make/gensrc/GensrcIcons.gmk
index 4cefe10984..de04286e62 100644
--- a/make/gensrc/GensrcIcons.gmk
+++ b/make/gensrc/GensrcIcons.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, , gensrc/GensrcIcons.gmk))
+$(eval $(call IncludeCustomExtension, gensrc/GensrcIcons.gmk))
 
 GENSRC_AWT_ICONS :=
 GENSRC_AWT_ICONS_SRC :=
diff --git a/make/hotspot/gensrc/GenerateSources.gmk b/make/hotspot/gensrc/GenerateSources.gmk
index 4c96e463e6..644bb4f5cb 100644
--- a/make/hotspot/gensrc/GenerateSources.gmk
+++ b/make/hotspot/gensrc/GenerateSources.gmk
@@ -39,7 +39,7 @@ include gensrc/GensrcAdlc.gmk
 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.
diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
index f6622e8841..c78015e545 100644
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -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)
 
diff --git a/make/hotspot/gensrc/GensrcJvmti.gmk b/make/hotspot/gensrc/GensrcJvmti.gmk
index c7340dabc1..1dfe38fce9 100644
--- a/make/hotspot/gensrc/GensrcJvmti.gmk
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk
@@ -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
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index c944c3481c..505c6fa560 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -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
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index da7d4eafc8..bf4280b8de 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -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).
diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index 3880e685fe..9a69c5330b 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -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
diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk
index aae8d0cf86..81bc880fd4 100644
--- a/make/hotspot/lib/JvmMapfile.gmk
+++ b/make/hotspot/lib/JvmMapfile.gmk
@@ -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
diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
index b8eddbd9df..b9092001e3 100644
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -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
diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
index 340072ca48..26b89d54b8 100644
--- a/make/launcher/Launcher-java.base.gmk
+++ b/make/launcher/Launcher-java.base.gmk
@@ -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
diff --git a/make/launcher/Launcher-java.desktop.gmk b/make/launcher/Launcher-java.desktop.gmk
index ab60dea9b0..d2e39b440b 100644
--- a/make/launcher/Launcher-java.desktop.gmk
+++ b/make/launcher/Launcher-java.desktop.gmk
@@ -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, \
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index fcb6ead748..2fc2d67b06 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -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 @@ endif
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries.gmk))
+$(eval $(call IncludeCustomExtension, lib/Awt2dLibraries.gmk))
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
index 6b6f1edacf..f8e0983a00 100644
--- a/make/lib/CoreLibraries.gmk
+++ b/make/lib/CoreLibraries.gmk
@@ -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))
 
 
 ##########################################################################################
diff --git a/make/lib/Lib-java.instrument.gmk b/make/lib/Lib-java.instrument.gmk
index caee912c30..2fbc6ab283 100644
--- a/make/lib/Lib-java.instrument.gmk
+++ b/make/lib/Lib-java.instrument.gmk
@@ -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))
 
 ################################################################################
 
diff --git a/make/lib/Lib-java.management.gmk b/make/lib/Lib-java.management.gmk
index e583ca338c..6e7edc3b11 100644
--- a/make/lib/Lib-java.management.gmk
+++ b/make/lib/Lib-java.management.gmk
@@ -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))
 
 ################################################################################
 
diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
index bd8cdaa4c2..00dfda0c24 100644
--- a/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
@@ -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))
 
 ################################################################################
 
diff --git a/make/lib/Lib-jdk.management.gmk b/make/lib/Lib-jdk.management.gmk
index f6f68049ad..b04f5b2ed3 100644
--- a/make/lib/Lib-jdk.management.gmk
+++ b/make/lib/Lib-jdk.management.gmk
@@ -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))
 
 ################################################################################
 
diff --git a/make/lib/LibCommon.gmk b/make/lib/LibCommon.gmk
index 112a234eb8..487d882dbf 100644
--- a/make/lib/LibCommon.gmk
+++ b/make/lib/LibCommon.gmk
@@ -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))
 
 ################################################################################
 
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 8079292213..073b422566 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -35,7 +35,7 @@ include $(SPEC)
 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.
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index 548e22fbec..b4780d3c09 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -35,7 +35,7 @@ include $(SPEC)
 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.