commit 46ed451d12272edcb0ada9a8e0ec1f5f6e340ff8
author Dan Willemsen <dwillemsen@google.com> Fri Aug 07 00:47:51 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 07 00:47:51 2015 +0000
tree fdb07223732e286cfdb6bafd6e51c6796101fa4a
parent 7b49da7e9a97f7064e275251957ed78dc5e38360
parent ec224d5072f4af2b01aa0e4f06b161246054b028

Merge "build: Load makefiles in the same order with Make 4.0"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 6bceee4..f20b2b7 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -139,7 +139,7 @@
 ###########################################################
 
 define all-makefiles-under
-$(wildcard $(1)/*/Android.mk)
+$(sort $(wildcard $(1)/*/Android.mk))
 endef
 
 ###########################################################
@@ -171,7 +171,7 @@
 
 # $(1): List of directories to look for under this directory
 define all-named-subdir-makefiles
-$(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))
+$(sort $(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1)))))
 endef
 
 ###########################################################