From e42fd0aadb246179cc3732096879ec0dfba97227 Mon Sep 17 00:00:00 2001
From: Mandy Chung <mchung@openjdk.org>
Date: Thu, 31 Mar 2016 14:11:33 -0700
Subject: [PATCH] 8153217: javafx modules are not included in the jre

Reviewed-by: alanb
---
 jdk/make/gensrc/GensrcModuleLoaderMap.gmk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk
index 859017d2a6d..4d9fdbb9e22 100644
--- a/jdk/make/gensrc/GensrcModuleLoaderMap.gmk
+++ b/jdk/make/gensrc/GensrcModuleLoaderMap.gmk
@@ -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