Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorkvn
Mon, 02 Mar 2015 15:15:15 -0800
changeset 29240 3ea345d6a7ef
parent 29239 d3780f05b8f1 (current diff)
parent 29231 e515c8f5bbec (diff)
child 29241 db804075e600
Merge
--- a/jdk/make/gensrc/Gensrc-java.management.gmk	Mon Mar 02 10:09:03 2015 -0800
+++ b/jdk/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/jdk/make/src/classes/build/tools/module/boot.modules	Mon Mar 02 10:09:03 2015 -0800
+++ b/jdk/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
jdk-sandbox