70 # to be deprivileged |
70 # to be deprivileged |
71 BOOT_MODULES += \ |
71 BOOT_MODULES += \ |
72 jdk.naming.rmi \ |
72 jdk.naming.rmi \ |
73 # |
73 # |
74 |
74 |
|
75 # Modules that directly or indirectly requiring upgradeable modules |
|
76 # should carefully be considered if it should be upgradeable or not. |
75 UPGRADEABLE_MODULES += \ |
77 UPGRADEABLE_MODULES += \ |
76 java.activation \ |
78 java.activation \ |
|
79 java.compiler \ |
77 java.corba \ |
80 java.corba \ |
78 java.transaction \ |
81 java.transaction \ |
79 java.xml.bind \ |
82 java.xml.bind \ |
80 java.xml.ws \ |
83 java.xml.ws \ |
81 java.xml.ws.annotation \ |
84 java.xml.ws.annotation \ |
82 jdk.internal.vm.compiler \ |
85 jdk.internal.vm.compiler \ |
83 # |
86 # |
84 |
87 |
85 # Modules explicitly declared as not being upgradeable even though they require |
88 UPGRADEABLE_TOOL_MODULES += \ |
86 # an upgradeable module. |
89 jdk.xml.bind \ |
87 NON_UPGRADEABLE_MODULES += \ |
90 jdk.xml.ws \ |
88 jdk.aot \ |
|
89 # |
91 # |
90 |
92 |
91 AGGREGATOR_MODULES += \ |
93 AGGREGATOR_MODULES += \ |
92 java.se \ |
94 java.se \ |
93 java.se.ee \ |
95 java.se.ee \ |
382 $(sort $(foreach m, $1, $(call FindTransitiveIndirectDepsForModule, $m))) |
380 $(sort $(foreach m, $1, $(call FindTransitiveIndirectDepsForModule, $m))) |
383 |
381 |
384 # Upgradeable modules are those that are either defined as upgradeable or that |
382 # Upgradeable modules are those that are either defined as upgradeable or that |
385 # require an upradeable module. |
383 # require an upradeable module. |
386 FindAllUpgradeableModules = \ |
384 FindAllUpgradeableModules = \ |
387 $(filter-out $(MODULES_FILTER) $(NON_UPGRADEABLE_MODULES), \ |
385 $(sort $(filter-out $(MODULES_FILTER), $(UPGRADEABLE_MODULES) $(UPGRADEABLE_TOOL_MODULES))) |
388 $(sort $(UPGRADEABLE_MODULES) $(foreach m, \ |
386 |
389 $(filter-out $(UPGRADEABLE_MODULES), $(call FindAllModules)), \ |
|
390 $(if $(filter $(UPGRADEABLE_MODULES), \ |
|
391 $(call FindTransitiveDepsForModule, $m)), \ |
|
392 $m \ |
|
393 ) \ |
|
394 )) \ |
|
395 ) |
|
396 |
387 |
397 ################################################################################ |
388 ################################################################################ |
398 |
389 |
399 LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS)/legal |
390 LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS)/legal |
400 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
391 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |