commit 7c3e3f8314eec2c053012dd97d2ae649ebeb5653
author Dan Willemsen <dwillemsen@google.com> Tue Sep 29 16:30:21 2015 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Sep 30 22:25:49 2015 +0000
tree 4c2df64d04394280a4cfbb7224caa54b4c18fe8e
parent 379f9f9cec4fe1c66b6d60a6c19fecb81b9eb410

Sort more instances of wildcard and find

Many of these may not make a difference in the output images, but it's a
good idea to keep the make system as repeatable as possible.

Change-Id: I31804b8ad5805148ed08be7426a242a16f4d0df3

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 893461a..b4202a0 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -125,7 +125,7 @@
 ##
 
 droiddoc_templates := \
-    $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f)
+    $(sort $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f))
 
 droiddoc := \
 	$(HOST_JDK_TOOLS_JAR) \
@@ -142,7 +142,7 @@
 html_dir_files :=
 ifneq ($(strip $(LOCAL_DROIDDOC_HTML_DIR)),)
 $(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR)
-html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f)
+html_dir_files := $(sort $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f))
 else
 $(full_target): PRIVATE_DROIDDOC_HTML_DIR :=
 endif