Factor out the full device configuration.
In an upcoming patch we are going to add "mini" device configurations
that avoid most of the usual driver dependencies. This requires
splitting out the device-specific configuration from the configuration
required for a full device image.
Bug: 217455793
Change-Id: Id17d162d142a2595e54e163f5faaf7dcf9b68e35
diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 959347b..a16c54f 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,7 +1,7 @@
ifneq ($(filter db845c, $(TARGET_DEVICE)),)
-$(PRODUCT_OUT)/dtb.img: $(DB845C_KERNEL_DIR)/sdm845-db845c.dtb
- -cat $(DB845C_KERNEL_DIR)/sdm845-db845c.dtb $(DB845C_KERNEL_DIR)/qrb5165-rb5.dtb > $@
+$(PRODUCT_OUT)/dtb.img: $(TARGET_KERNEL_DIR)/sdm845-db845c.dtb $(wildcard $(TARGET_KERNEL_DIR)/qrb5165-rb5.dtb)
+ cat $^ > $@
droidcore: $(PRODUCT_OUT)/dtb.img