From f23e6bfda08cc629cded7c1ef4b24eb8a0365403 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Thu, 28 Jul 2016 15:56:48 -0700
Subject: [PATCH] Limit find-copy-subdir-files to just files

This is used to add entries to PRODUCT_COPY_FILES -- those should always
be files, not directories or anything else special.

Bug: 30482029
Change-Id: I2691ae81c344c22e518c6b10cd485c73d654a03b
---
 core/product_config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/product_config.mk b/core/product_config.mk
index 0d4ced320..6438d51be 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -74,7 +74,7 @@ endif
 ###########################################################
 
 define find-copy-subdir-files
-$(shell find $(2) -name "$(1)" | $(SED_EXTENDED) "s:($(2)/?(.*)):\\1\\:$(3)/\\2:" | sed "s://:/:g")
+$(sort $(shell find $(2) -name "$(1)" -type f | $(SED_EXTENDED) "s:($(2)/?(.*)):\\1\\:$(3)/\\2:" | sed "s://:/:g"))
 endef
 
 # ---------------------------------------------------------------