dtb: generate dt.img with footer data [1/3]

BUG: 157624209

Problem:
do not copy dtb-avb.img to dt.img
build footer data to dt.img directly

Solution:
build footer data to dt.img directly

Verify:
sabrina

Change-Id: I160f300514a7dd2bf5376be7cc43580517f6836c

1 files changed, 7 insertions, 11 deletions

diff --git a/factory.mk b/factory.mk
index 43d47ca..c706541 100644
--- a/factory.mk
+++ b/factory.mk
@@ -72,9 +72,8 @@ AML_TARGET := $(PRODUCT_OUT)/obj/PACKAGING/target_files_intermediates/$(name_aml
 AML_TARGET_ZIP := $(PRODUCT_OUT)/super_empty_all.img
 
 ifeq ($(BUILD_WITH_AVB),true)
-INSTALLED_AVB_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb-avb.img
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += \
-    --include_descriptors_from_image $(INSTALLED_AVB_DTBIMAGE_TARGET)
+    --include_descriptors_from_image $(INSTALLED_BOARDDTB_TARGET)
 
 # Add a dependency of AVBTOOL to INSTALLED_BOARDDTB_TARGET
 $(INSTALLED_BOARDDTB_TARGET): $(AVBTOOL)
@@ -120,7 +119,7 @@ define build_kernel_proc
 		$(1)
 endef
 
-$(INSTALLED_BOARDDTB_TARGET) : $(KERNEL_DEVICETREE_SRC) $(DTCTOOL) $(DTIMGTOOL) $(KERNEL_CONFIG) | $(MINIGZIP)
+$(LOCAL_DTB) : $(KERNEL_DEVICETREE_SRC) $(DTCTOOL) $(DTIMGTOOL) $(KERNEL_CONFIG) | $(MINIGZIP)
 	mkdir -p $(PRODUCT_OUT)/dts;
 	$(foreach aDts, $(KERNEL_DEVICETREE), \
 		sed -i 's/^#include \"partition_.*/#include \"$(TARGET_PARTITION_DTSI)\"/' $(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(strip $(aDts)).dts; \
@@ -143,11 +142,14 @@ endif
 		mv $@ $@.orig && $(MINIGZIP) -c $@.orig > $@; \
 	fi;
 	$(hide) $(call aml-secureboot-sign-bin, $@)
+
+
+$(INSTALLED_BOARDDTB_TARGET) : $(LOCAL_DTB)
 	@echo "Instaled $@"
+	cp $(LOCAL_DTB) $@
 ifeq ($(BOARD_AVB_ENABLE),true)
-	cp $@ $(INSTALLED_AVB_DTBIMAGE_TARGET)
 	$(AVBTOOL) add_hash_footer \
-	  --image $(INSTALLED_AVB_DTBIMAGE_TARGET) \
+	  --image $@ \
 	  --partition_size $(BOARD_DTBIMAGE_PARTITION_SIZE) \
 	  --partition_name dtb
 endif
@@ -540,9 +542,6 @@ ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true)
 		ln -sf $(shell readlink -f $(AML_TARGET)/IMAGES/$(file)) $(PRODUCT_UPGRADE_OUT)/$(file); \
 		)
 endif
-ifeq ($(BUILD_WITH_AVB),true)
-	cp $(PRODUCT_OUT)/dtb-avb.img $(PRODUCT_UPGRADE_OUT)/dt.img
-endif
 ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true)
 	$(hide) rm -f $(PRODUCT_UPGRADE_OUT)/bootloader.img.encrypt.*
 	$(hide) $(ACP) $(PRODUCT_OUT)/bootloader.img.encrypt.* $(PRODUCT_UPGRADE_OUT)/
@@ -618,9 +617,6 @@ else
 	cp $(PRODUCT_OUT)/bootloader.img $(PRODUCT_OUT)/fastboot_auto/
 	cp $(PRODUCT_OUT)/dt.img $(PRODUCT_OUT)/fastboot_auto/
 endif
-ifeq ($(BUILD_WITH_AVB),true)
-	cp $(PRODUCT_OUT)/dtb-avb.img $(PRODUCT_OUT)/fastboot_auto/dt.img
-endif
 	cp $(PRODUCT_OUT)/upgrade/logo.img $(PRODUCT_OUT)/fastboot_auto/
 ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true)
 ifeq ($(AB_OTA_UPDATER),true)