160     $(JAXP_TOPDIR)/src \
 161     $(JAXWS_TOPDIR)/src \
 162     $(NASHORN_TOPDIR)/src \
 163     #
 164 
 165 SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes
 166 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
 167   SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes
 168 endif
 169 SRC_SUBDIRS += share/classes
 170 
 171 # Find all module-info.java files for the current build target platform and
 172 # configuration.
 173 # Param 1 - Module to find for, set to * for finding all
 174 FindAllModuleInfos = \
 175     $(wildcard \
 176         $(foreach sub, $(SRC_SUBDIRS), \
 177           $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
 178         $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
 179 










 180 # Extract the module names from the paths of module-info.java files. The
 181 # position of the module directory differs depending on if this is an imported
 182 # src dir or not.
 183 GetModuleNameFromModuleInfo = \
 184     $(strip $(foreach mi, $1, \
 185       $(if $(filter $(addsuffix %, $(IMPORT_MODULES_SRC)), $(mi)), \
 186         $(notdir $(patsubst %/,%, $(dir $(mi)))), \
 187         $(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(mi)))))))))))
 188 
 189 # Find all modules by looking for module-info.java files and looking at parent
 190 # directories.
 191 FindAllModules = \
 192     $(sort $(filter-out $(MODULES_FILTER), \
 193     $(call GetModuleNameFromModuleInfo, $(MODULE_INFOS))))







 194 
 195 FindImportedModules = \
 196     $(filter-out $(MODULES_FILTER), \
 197     $(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*))))
 198 
 199 # Find all source dirs for a particular module
 200 # $1 - Module to find source dirs for
 201 FindModuleSrcDirs = \
 202     $(strip $(wildcard \
 203         $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
 204         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
 205 
 206 # Construct the complete module source path
 207 GetModuleSrcPath = \
 208     $(call PathList, \
 209         $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
 210         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))
 211 
 212 ################################################################################
 213 # Extract module dependencies from module-info.java files.

 160     $(JAXP_TOPDIR)/src \
 161     $(JAXWS_TOPDIR)/src \
 162     $(NASHORN_TOPDIR)/src \
 163     #
 164 
 165 SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes
 166 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
 167   SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes
 168 endif
 169 SRC_SUBDIRS += share/classes
 170 
 171 # Find all module-info.java files for the current build target platform and
 172 # configuration.
 173 # Param 1 - Module to find for, set to * for finding all
 174 FindAllModuleInfos = \
 175     $(wildcard \
 176         $(foreach sub, $(SRC_SUBDIRS), \
 177           $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
 178         $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC)))
 179 
 180 # Find module-info.java files in the specific source dir
 181 # Param 1 - Src dir to find module-info.java files in
 182 FindModuleInfosForSrcDir = \
 183     $(wildcard \
 184         $(foreach sub, $(SRC_SUBDIRS), \
 185           $(patsubst %,%/*/$(sub)/module-info.java, $(strip $1)) \
 186         ) \
 187         $(patsubst %,%/*/module-info.java, $(strip $1)) \
 188     )
 189 
 190 # Extract the module names from the paths of module-info.java files. The
 191 # position of the module directory differs depending on if this is an imported
 192 # src dir or not.
 193 GetModuleNameFromModuleInfo = \
 194     $(strip $(foreach mi, $1, \
 195       $(if $(filter $(addsuffix %, $(IMPORT_MODULES_SRC)), $(mi)), \
 196         $(notdir $(patsubst %/,%, $(dir $(mi)))), \
 197         $(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(mi)))))))))))
 198 
 199 # Find all modules by looking for module-info.java files and looking at parent
 200 # directories.
 201 FindAllModules = \
 202     $(sort $(filter-out $(MODULES_FILTER), \
 203     $(call GetModuleNameFromModuleInfo, $(MODULE_INFOS))))
 204 
 205 # Find all modules in a specific src dir
 206 # Param 1 - Src dir to find modules in
 207 FindModulesForSrcDir = \
 208     $(sort $(filter-out $(MODULES_FILTER), \
 209         $(call GetModuleNameFromModuleInfo, $(call FindModuleInfosForSrcDir, $1)) \
 210     ))
 211 
 212 FindImportedModules = \
 213     $(filter-out $(MODULES_FILTER), \
 214     $(if $(IMPORT_MODULES_CLASSES), $(notdir $(wildcard $(IMPORT_MODULES_CLASSES)/*))))
 215 
 216 # Find all source dirs for a particular module
 217 # $1 - Module to find source dirs for
 218 FindModuleSrcDirs = \
 219     $(strip $(wildcard \
 220         $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
 221         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
 222 
 223 # Construct the complete module source path
 224 GetModuleSrcPath = \
 225     $(call PathList, \
 226         $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \
 227         $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /*/$(sub), $(TOP_SRC_DIRS))))
 228 
 229 ################################################################################
 230 # Extract module dependencies from module-info.java files.