commit f23e6bfda08cc629cded7c1ef4b24eb8a0365403
author Dan Willemsen <dwillemsen@google.com> Thu Jul 28 15:56:48 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Jul 28 23:16:45 2016 +0000
tree 21c2034d45fc44d1b8da44dfb11ae8c14cfd76ce
parent 65f15a2755912bca31dd729ff3d40413ade9f976

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

diff --git a/core/product_config.mk b/core/product_config.mk
index 0d4ced3..6438d51 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -74,7 +74,7 @@
 ###########################################################
 
 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
 
 # ---------------------------------------------------------------