equal
deleted
inserted
replaced
245 |
245 |
246 ################################################################################ |
246 ################################################################################ |
247 # Exclude building of IIOP transport for RMI Connector |
247 # Exclude building of IIOP transport for RMI Connector |
248 java.management_EXCLUDES := com/sun/jmx/remote/protocol/iiop |
248 java.management_EXCLUDES := com/sun/jmx/remote/protocol/iiop |
249 |
249 |
250 # Why is this in the open source tree? |
|
251 ifdef OPENJDK |
|
252 java.management_EXCLUDES := \ |
|
253 com/sun/jmx/snmp \ |
|
254 sun/management/snmp \ |
|
255 # |
|
256 endif |
|
257 |
|
258 ifeq ($(RMICONNECTOR_IIOP), false) |
250 ifeq ($(RMICONNECTOR_IIOP), false) |
259 java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop |
251 java.management_EXCLUDES += com/sun/jmx/remote/protocol/iiop |
260 endif |
252 endif |
261 |
253 |
262 ################################################################################ |
254 ################################################################################ |
477 define SetupModuleCompilation |
469 define SetupModuleCompilation |
478 # Find the module dependencies by parsing modules.list file |
470 # Find the module dependencies by parsing modules.list file |
479 $1_DEPS := $$(call FindDepsForModule, $1) |
471 $1_DEPS := $$(call FindDepsForModule, $1) |
480 |
472 |
481 $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS)) |
473 $1_CLASSPATH := $$(addprefix $(JDK_OUTPUTDIR)/modules/,$$($1_DEPS)) |
|
474 # When crypto classes are prebuilt, need to look for classes already in |
|
475 # output dir. |
|
476 ifneq ($(BUILD_CRYPTO), true) |
|
477 $1_CLASSPATH += $(JDK_OUTPUTDIR)/modules/$1 |
|
478 endif |
482 ifeq ($1, jdk.hotspot.agent) |
479 ifeq ($1, jdk.hotspot.agent) |
483 ## The source of this module is compiled elsewhere, hotspot, and imported. |
480 ## The source of this module is compiled elsewhere, hotspot, and imported. |
484 ## Service types are required in the classpath when compiing module-info |
481 ## Service types are required in the classpath when compiing module-info |
485 $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent) |
482 $1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent) |
486 endif |
483 endif |