From c63a74474b706c04a9ebf0f23b15089c30548f49 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Thu, 7 Feb 2019 11:38:18 -0800 Subject: [PATCH] Only pick DTBs from BOARD_PREBUILT_DTBIMAGE_DIR This change is required to prevent the build system from picking up DTB files from subdirectories to BOARD_PREBUILT_DTBIMAGE_DIR. Test: make bootimage Bug: 123648105 Change-Id: Ibc2a133f3c9be6362579dc9bf9ca399912b9d8a2 --- core/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index ea389422e0..f2988fbe9f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -840,8 +840,7 @@ $(call dist-for-goals, sdk win_sdk sdk_addon, $(INSTALLED_FILES_FILE_ROOT)) 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