8153217: javafx modules are not included in the jre

Reviewed-by: alanb
This commit is contained in:
Mandy Chung 2016-03-31 14:11:15 -07:00
parent 04603900eb
commit 1263380ce0
2 changed files with 3 additions and 2 deletions

@ -41,7 +41,8 @@ $(eval $(call IncludeCustomExtension, , Images-pre.gmk))
# All modules for the current target platform.
ALL_MODULES := $(call FindAllModules)
$(eval $(call ReadImportMetaData))
IMPORTED_MODULES := $(call FindImportedModules)
$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
JRE_MODULES += $(filter-out $(MODULES_FILTER), $(BOOT_MODULES) $(PLATFORM_MODULES) $(JRE_TOOL_MODULES))
JDK_MODULES += $(filter-out $(MODULES_FILTER), $(ALL_MODULES))

@ -253,7 +253,7 @@ endef
# * JRE_TOOL_MODULES
define ReadImportMetaData
IMPORTED_MODULES := $(call FindImportedModules)
$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadImportMetaData, $m)))
$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
endef
################################################################################