From 8dd500f3401e8014385c217cfe5f2a65ef76e95d Mon Sep 17 00:00:00 2001
From: Brent Christian <bchristi@openjdk.org>
Date: Mon, 2 Mar 2015 13:37:30 -0800
Subject: [PATCH] 8073596: Add jdk.management.cmm in boot.modules that needs
 sun.management.spi be exported to it

Reviewed-by: alanb, erikj, ihse, mchung
---
 jdk/make/gensrc/Gensrc-java.management.gmk           | 3 +++
 jdk/make/src/classes/build/tools/module/boot.modules | 1 +
 2 files changed, 4 insertions(+)

diff --git a/jdk/make/gensrc/Gensrc-java.management.gmk b/jdk/make/gensrc/Gensrc-java.management.gmk
index 408fe46f35e..b0a3751631e 100644
--- a/jdk/make/gensrc/Gensrc-java.management.gmk
+++ b/jdk/make/gensrc/Gensrc-java.management.gmk
@@ -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
diff --git a/jdk/make/src/classes/build/tools/module/boot.modules b/jdk/make/src/classes/build/tools/module/boot.modules
index 03b4b0eca90..2c32d09526f 100644
--- a/jdk/make/src/classes/build/tools/module/boot.modules
+++ b/jdk/make/src/classes/build/tools/module/boot.modules
@@ -22,6 +22,7 @@ jdk.deploy.osx
 jdk.hprof.agent
 jdk.httpserver
 jdk.jfr
+jdk.management.cmm
 jdk.naming.rmi
 jdk.sctp
 jdk.security.auth