--- a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk Thu Mar 31 11:50:06 2016 -0700
+++ b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk Thu Mar 31 14:11:33 2016 -0700
@@ -25,7 +25,8 @@
include Modules.gmk
-$(eval $(call ReadImportMetaData))
+IMPORTED_MODULES := $(call FindImportedModules)
+$(foreach m, $(IMPORTED_MODULES), $(eval $(call ReadSingleImportMetaData, $m)))
# Replacing double-comma with a single comma is to workaround the issue
# with some version of make on windows that doesn't substitute spaces