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.
8153217: javafx modules are not included in the jre
authormchung
Thu, 31 Mar 2016 14:11:15 -0700
changeset 36723 295e7ec5d8f9
parent 36722 4a3c6cfbba89
child 36724 32a7658a6e0e
8153217: javafx modules are not included in the jre Reviewed-by: alanb
make/Images.gmk file | annotate | diff | comparison | revisions
make/common/Modules.gmk file | annotate | diff | comparison | revisions 
--- a/make/Images.gmk	Thu Mar 31 01:13:17 2016 -0700
+++ b/make/Images.gmk	Thu Mar 31 14:11:15 2016 -0700
@@ -41,7 +41,8 @@
 # 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))
--- a/make/common/Modules.gmk	Thu Mar 31 01:13:17 2016 -0700
+++ b/make/common/Modules.gmk	Thu Mar 31 14:11:15 2016 -0700
@@ -253,7 +253,7 @@
 # * 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
 
 ################################################################################
jdk-sandbox