8189376: Unsorted $(wildcard) causes instable module-deps.gmk

Reviewed-by: erikj, tbell
This commit is contained in:
Martin Buchholz 2017-10-26 10:39:59 +02:00 committed by Magnus Ihse Bursie
parent f4672a738b
commit a69940ab56

View File

@ -249,10 +249,10 @@ SPEC_SUBDIRS += share/specs
# configuration.
# Param 1 - Module to find for, set to * for finding all
FindAllModuleInfos = \
$(wildcard \
$(sort $(wildcard \
$(foreach sub, $(SRC_SUBDIRS), \
$(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \
$(patsubst %,%/$(strip $1)/module-info.java, $(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