stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8153261: Clean up fix for JDK-8153217

Browse Source 
Reviewed-by: tbell
This commit is contained in:
Erik Joelsson 2016-04-01 17:08:43 +02:00
parent 403d5cbfa2
commit 116ee6bdc6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
make/Images.gmk
View File

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

5
make/common/Modules.gmk
View File

@ -252,8 +252,9 @@ endef
# * PLATFORM_MODULES
# * JRE_TOOL_MODULES
define ReadImportMetaData
IMPORTED_MODULES := $(call FindImportedModules)
$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
IMPORTED_MODULES := $$(call FindImportedModules)
$$(foreach m, $$(IMPORTED_MODULES), \
$$(eval $$(call ReadSingleImportMetaData, $$m)))
endef
################################################################################