am 248a0ba0: am b8331622: am 46ed451d: Merge "build: Load makefiles in the same order with Make 4.0"

* commit '248a0ba02fe7d5bdfe4d3e741add0353a86e9e21':
  build: Load makefiles in the same order with Make 4.0
This commit is contained in:
Dan Willemsen 2015-08-08 02:48:15 +00:00 committed by Android Git Automerger
commit fe0bb57250
1 changed files with 2 additions and 2 deletions

View File

@ -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
###########################################################