commit 143ff1ff9a23aafcd6e93213b40485b344282e90
author Treehugger Robot <treehugger-gerrit@google.com> Fri Feb 08 22:02:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 08 22:02:05 2019 +0000
tree 153c14f110d931a9049d630cfd5ad4de99a2c0c1
parent aaf8cdf59df7dbd2db18ea8c8fcadf9605e5a58e
parent c63a74474b706c04a9ebf0f23b15089c30548f49

Merge "Only pick DTBs from BOARD_PREBUILT_DTBIMAGE_DIR"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 32df3d4..66c8716 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -846,8 +846,7 @@
 
 ifdef BOARD_PREBUILT_DTBIMAGE_DIR
 INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img
-$(INSTALLED_DTBIMAGE_TARGET) : $(addprefix $(BOARD_PREBUILT_DTBIMAGE_DIR)/,\
-	$(call find-files-in-subdirs,$(BOARD_PREBUILT_DTBIMAGE_DIR),*.dtb,.))
+$(INSTALLED_DTBIMAGE_TARGET) : $(sort $(wildcard $(BOARD_PREBUILT_DTBIMAGE_DIR)/*.dtb))
 	cat $^ > $@
 endif