Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63a7447 authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

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
parent 20258b55

core/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -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