changeset 48806:a7ce228abcd7

8196585: Make custom extension point additions Reviewed-by: erikj Contributed-by: andrew_m_leonard@uk.ibm.com
author erikj
date Thu, 01 Feb 2018 09:20:40 -0800
parents b0a54e2ba484
children 917868f73209
files make/common/SetupJavaCompilers.gmk make/gensrc/GensrcVarHandles.gmk make/lib/Lib-java.management.gmk make/lib/Lib-jdk.management.gmk
diffstat 4 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/SetupJavaCompilers.gmk	Thu Feb 01 09:16:03 2018 -0800
+++ b/make/common/SetupJavaCompilers.gmk	Thu Feb 01 09:20:40 2018 -0800
@@ -26,13 +26,16 @@
 ifndef _SETUP_GMK
 _SETUP_GMK := 1
 
+# Include custom extension hook
+$(eval $(call IncludeCustomExtension, common/SetupJavaCompilers.gmk))
+
 include JavaCompilation.gmk
 
-DISABLE_WARNINGS := -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
+DISABLE_WARNINGS ?= -Xlint:all,-deprecation,-removal,-unchecked,-rawtypes,-cast,-serial,-dep-ann,-static,-fallthrough,-try,-varargs,-empty,-finally
 
 # If warnings needs to be non-fatal for testing purposes use a command like:
 # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000"
-JAVAC_WARNINGS := -Xlint:all -Werror
+JAVAC_WARNINGS ?= -Xlint:all -Werror
 
 # The BOOT_JAVAC setup uses the boot jdk compiler to compile the tools
 # and the interim javac, to be run by the boot jdk.
--- a/make/gensrc/GensrcVarHandles.gmk	Thu Feb 01 09:16:03 2018 -0800
+++ b/make/gensrc/GensrcVarHandles.gmk	Thu Feb 01 09:20:40 2018 -0800
@@ -168,3 +168,7 @@
   $(eval $(call GenerateVarHandleByteArray,VAR_HANDLE_BYTE_ARRAY_$t,$t)))
 
 GENSRC_JAVA_BASE += $(GENSRC_VARHANDLES)
+
+# Include custom extension post hook
+$(eval $(call IncludeCustomExtension, gensrc/GensrcVarHandles-post.gmk))
+
--- a/make/lib/Lib-java.management.gmk	Thu Feb 01 09:16:03 2018 -0800
+++ b/make/lib/Lib-java.management.gmk	Thu Feb 01 09:20:40 2018 -0800
@@ -70,3 +70,7 @@
 TARGETS += $(BUILD_LIBMANAGEMENT)
 
 ################################################################################
+
+# Include custom extension post hook
+$(eval $(call IncludeCustomExtension, lib/Lib-java.management-post.gmk))
+
--- a/make/lib/Lib-jdk.management.gmk	Thu Feb 01 09:16:03 2018 -0800
+++ b/make/lib/Lib-jdk.management.gmk	Thu Feb 01 09:20:40 2018 -0800
@@ -80,3 +80,7 @@
 TARGETS += $(BUILD_LIBMANAGEMENT_EXT)
 
 ################################################################################
+
+# Include custom extension post hook
+$(eval $(call IncludeCustomExtension, lib/Lib-jdk.management-post.gmk))
+