equal
deleted
inserted
replaced
227 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
227 ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE)) |
228 SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes |
228 SRC_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/classes |
229 endif |
229 endif |
230 SRC_SUBDIRS += share/classes |
230 SRC_SUBDIRS += share/classes |
231 |
231 |
|
232 SPEC_SUBDIRS += share/specs |
|
233 |
232 # Find all module-info.java files for the current build target platform and |
234 # Find all module-info.java files for the current build target platform and |
233 # configuration. |
235 # configuration. |
234 # Param 1 - Module to find for, set to * for finding all |
236 # Param 1 - Module to find for, set to * for finding all |
235 FindAllModuleInfos = \ |
237 FindAllModuleInfos = \ |
236 $(wildcard \ |
238 $(wildcard \ |
278 # $1 - Module to find source dirs for |
280 # $1 - Module to find source dirs for |
279 FindModuleSrcDirs = \ |
281 FindModuleSrcDirs = \ |
280 $(strip $(wildcard \ |
282 $(strip $(wildcard \ |
281 $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
283 $(addsuffix /$(strip $1), $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
282 $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
284 $(foreach sub, $(SRC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
|
285 |
|
286 # Find all specs dirs for a particular module |
|
287 # $1 - Module to find specs dirs for |
|
288 FindModuleSpecsDirs = \ |
|
289 $(strip $(wildcard \ |
|
290 $(foreach sub, $(SPEC_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) |
283 |
291 |
284 # Construct the complete module source path |
292 # Construct the complete module source path |
285 GetModuleSrcPath = \ |
293 GetModuleSrcPath = \ |
286 $(call PathList, \ |
294 $(call PathList, \ |
287 $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |
295 $(addsuffix /*, $(GENERATED_SRC_DIRS) $(IMPORT_MODULES_SRC)) \ |