# HG changeset patch
# User erikj
# Date 1485508541 -3600
# Node ID 0ac98135a64b0e73e09fc228333ed37784793fa3
# Parent  23f214f8603953790ca9d2d4936e5ded72b8cef4
8170483: Remove modules_src_jake workaround for JavaFX transition to new module-info syntax
Reviewed-by: alanb, mchung

diff -r 23f214f86039 -r 0ac98135a64b common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Jan 26 21:20:23 2017 +0000
+++ b/common/autoconf/generated-configure.sh	Fri Jan 27 10:15:41 2017 +0100
@@ -5180,7 +5180,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1484571183
+DATE_WHEN_GENERATED=1485508515
 
 ###############################################################################
 #
@@ -31283,12 +31283,6 @@
   if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
     IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
   fi
-  # Workaround for using different imported module-info.java in Jake due to a
-  # change in format. Remove once new format is standard in JDK 9 and javafx
-  # delivers just that.
-  if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then
-    IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC"
-  fi
   if test -d "$IMPORT_MODULES_TOPDIR/make"; then
     IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
   fi
diff -r 23f214f86039 -r 0ac98135a64b common/autoconf/source-dirs.m4
--- a/common/autoconf/source-dirs.m4	Thu Jan 26 21:20:23 2017 +0000
+++ b/common/autoconf/source-dirs.m4	Fri Jan 27 10:15:41 2017 +0100
@@ -114,12 +114,6 @@
   if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then
     IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src"
   fi
-  # Workaround for using different imported module-info.java in Jake due to a
-  # change in format. Remove once new format is standard in JDK 9 and javafx
-  # delivers just that.
-  if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then
-    IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC"
-  fi
   if test -d "$IMPORT_MODULES_TOPDIR/make"; then
     IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make"
   fi
diff -r 23f214f86039 -r 0ac98135a64b make/common/Modules.gmk
--- a/make/common/Modules.gmk	Thu Jan 26 21:20:23 2017 +0000
+++ b/make/common/Modules.gmk	Fri Jan 27 10:15:41 2017 +0100
@@ -182,15 +182,12 @@
 
 # Find all module-info.java files for the current build target platform and
 # configuration.
-# TODO: The $(firstword call is part of a workaround for using different
-# imported module-info.java in Jake due to a change in format. Remove once
-# new format is standard in JDK 9 and javafx delivers just that.
 # Param 1 - Module to find for, set to * for finding all
 FindAllModuleInfos = \
     $(wildcard \
         $(foreach sub, $(SRC_SUBDIRS), \
           $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
-        $(patsubst %,%/$(strip $1)/module-info.java, $(firstword $(IMPORT_MODULES_SRC))))
+        $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
 
 # Find module-info.java files in the specific source dir
 # Param 1 - Src dir to find module-info.java files in