# HG changeset patch
# User erikj
# Date 1459523323 -7200
# Node ID f458544b0d76e7e410f7b07f340b6f2e0c4c0e66
# Parent  32a7658a6e0ec385325d364f0ea9f72afd7179c3
8153261: Clean up fix for JDK-8153217
Reviewed-by: tbell

diff -r 32a7658a6e0e -r f458544b0d76 make/Images.gmk
--- a/make/Images.gmk	Fri Apr 01 17:06:44 2016 +0200
+++ b/make/Images.gmk	Fri Apr 01 17:08:43 2016 +0200
@@ -41,8 +41,7 @@
 # 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))
diff -r 32a7658a6e0e -r f458544b0d76 make/common/Modules.gmk
--- a/make/common/Modules.gmk	Fri Apr 01 17:06:44 2016 +0200
+++ b/make/common/Modules.gmk	Fri Apr 01 17:08:43 2016 +0200
@@ -252,8 +252,9 @@
 # * 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
 
 ################################################################################