From a69940ab56a774cc5802fc1aec51fd6df794e1c6 Mon Sep 17 00:00:00 2001
From: Martin Buchholz <martinrb@google.com>
Date: Thu, 26 Oct 2017 10:39:59 +0200
Subject: [PATCH] 8189376: Unsorted $(wildcard) causes instable module-deps.gmk

Reviewed-by: erikj, tbell
---
 make/common/Modules.gmk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 047ad3c8337..04cafcd115c 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -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