From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 6 Aug 2015 22:01:24 +0000 (-0700)
Subject: build: Load makefiles in the same order with Make 4.0
X-Git-Tag: android-x86-7.1-r1~608^2~19^2~147^2~97^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec224d5072f4af2b01aa0e4f06b161246054b028;p=android-x86%2Fbuild.git

build: Load makefiles in the same order with Make 4.0

Make 4.0 (and Kati) removed the implicit sort from the $(wildcard)
function. In order to ensure that makefiles are always loaded in the
same order, and an explicit sort.

This shouldn't matter, but some makefiles are modifying variables used
by siblings (LLVM_ROOT_PATH under frameworks/compile). In this case, the
path value still pointed to the same path, it just had extra '..'
references, and was enough to cause the binaries to be different.

Change-Id: Ief6551f999351ee2c193275aaae426dc064f8b34
---

diff --git a/core/definitions.mk b/core/definitions.mk
index a47202cf4..1d59049d6 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -139,7 +139,7 @@ endef
 ###########################################################
 
 define all-makefiles-under
-$(wildcard $(1)/*/Android.mk)
+$(sort $(wildcard $(1)/*/Android.mk))
 endef
 
 ###########################################################
@@ -171,7 +171,7 @@ endef
 
 # $(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
 
 ###########################################################