changeset 11554:c5ea253b6dc0

Merge
author kvn
date Mon, 02 Mar 2015 15:15:15 -0800
parents 11dfc712c44f c9257ce77b6f
children 769e84968ef2
files
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/make/gensrc/Gensrc-java.management.gmk	Mon Mar 02 10:09:03 2015 -0800
+++ b/make/gensrc/Gensrc-java.management.gmk	Mon Mar 02 15:15:15 2015 -0800
@@ -25,6 +25,9 @@
 
 include GensrcCommon.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-java.management.gmk))
+
 ################################################################################
 
 include GensrcProperties.gmk
--- a/make/src/classes/build/tools/module/boot.modules	Mon Mar 02 10:09:03 2015 -0800
+++ b/make/src/classes/build/tools/module/boot.modules	Mon Mar 02 15:15:15 2015 -0800
@@ -22,6 +22,7 @@
 jdk.hprof.agent
 jdk.httpserver
 jdk.jfr
+jdk.management.cmm
 jdk.naming.rmi
 jdk.sctp
 jdk.security.auth