| author | Xindong Xu <xindong.xu@amlogic.com> | 2020-06-27 02:29:30 (GMT) |
|---|---|---|
| committer | Ben Cheng <bccheng@google.com> | 2020-06-28 09:23:23 (GMT) |
| commit | f8b3206d5e107cac1e294c324bef943d88cf3351 (patch) | |
| tree | c25eaac1f0ccaee77537797f6096ef62664cb0ec | |
| parent | 19108e025e8336af062b242c76ba39a02514c6ec (diff) | |
| download | common-f8b3206d5e107cac1e294c324bef943d88cf3351.zip common-f8b3206d5e107cac1e294c324bef943d88cf3351.tar.gz common-f8b3206d5e107cac1e294c324bef943d88cf3351.tar.bz2 | |
ota: generate super_empty_all.img to target zip [1/1]
Problem:
we only generate super_empty_all.img to ota zip before
There is no super_empty_all.img in target zip
Solution:
generate super_empty_all.img to target zip
Verify:
sabrina
Bug: 159290015
Test: Verified with new_ota.zip from "build/tools/releasetools/ota_from_target_files --wipe_user_data ~/Downloads/sabrina-target_files-P15396188.zip new_ota.zip"
Change-Id: Iab70810c6ec6a1be9f0e2099d6923e2d074d5ea3
| -rw-r--r-- | factory.mk | 20 |
1 files changed, 8 insertions, 12 deletions
@@ -188,6 +188,9 @@ $(warning echo "radio add dt and bootloader") endif endif#ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) +INSTALLED_RADIOIMAGE_TARGET += $(PRODUCT_OUT)/super_empty_all.img +BOARD_PACK_RADIOIMAGES += super_empty_all.img + BOARD_PACK_RADIOIMAGES += $(filter system.img vendor.img,$(BUILT_IMAGES)) UPGRADE_FILES := \ @@ -506,6 +509,7 @@ endif# ifeq ($(PRODUCT_BUILD_SECURE_BOOT_IMAGE_DIRECTLY),true) TARGET_USB_BURNING_V2_DEPEND_MODULES := $(AML_TARGET).zip #copy xx.img to $(AML_TARGET)/IMAGES for diff upgrade INTERNAL_SUPERIMAGE_DIST_TARGET := $(PRODUCT_OUT)/obj/PACKAGING/super.img_intermediates/super.img +INSTALLED_SUPERIMAGE_EMPTY_TARGET := $(PRODUCT_OUT)/super_empty.img .PHONY:aml_upgrade aml_upgrade:$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) @@ -696,20 +700,12 @@ $(INSTALLED_AML_EMMC_BIN): $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(PRODUCT_CFG aml_emmc_bin :$(INSTALLED_AML_EMMC_BIN) endif # ifeq ($(TARGET_SUPPORT_USB_BURNING_V2),true) -$(AML_TARGET_ZIP): $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(TARGET_USB_BURNING_V2_DEPEND_MODULES) +$(AML_TARGET_ZIP): $(INSTALLED_SUPERIMAGE_EMPTY_TARGET) ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true) dd if=/dev/zero of=$(PRODUCT_OUT)/empty_1.bin bs=1 count=4096 - cp $(AML_TARGET)/IMAGES/super_empty.img $(PRODUCT_OUT)/super_empty.img - dd if=$(AML_TARGET)/IMAGES/super_empty.img bs=1 count=4096 skip=0 of=$(PRODUCT_OUT)/empty_2.bin - dd if=$(AML_TARGET)/IMAGES/super_empty.img bs=1 count=4096 skip=4096 of=$(PRODUCT_OUT)/empty_3.bin - rm $(AML_TARGET)/IMAGES/super_empty.img - cat $(PRODUCT_OUT)/empty_1.bin $(PRODUCT_OUT)/empty_2.bin $(PRODUCT_OUT)/empty_1.bin $(PRODUCT_OUT)/empty_3.bin > $(AML_TARGET)/IMAGES/super_empty.img - rm -rf $(AML_TARGET).zip - #cd $(PRODUCT_OUT)/obj/PACKAGING/target_files_intermediates/; mkdir -p IMAGES; \ - #cp $(name_aml)-target_files-$(FILE_NAME)/IMAGES/super_empty.img IMAGES/; zip -u $(name_aml)-target_files-$(FILE_NAME).zip ./IMAGES/super_empty.img - ./out/soong/host/linux-x86/bin/soong_zip -d -o $(AML_TARGET).zip -C $(AML_TARGET) -l $(AML_TARGET).zip.list - cp $(AML_TARGET)/IMAGES/super_empty.img $@ - cp $(AML_TARGET)/IMAGES/super_empty.img $(AML_TARGET)/IMAGES/super_empty_all.img + dd if=$(PRODUCT_OUT)/super_empty.img bs=1 count=4096 skip=0 of=$(PRODUCT_OUT)/empty_2.bin + dd if=$(PRODUCT_OUT)/super_empty.img bs=1 count=4096 skip=4096 of=$(PRODUCT_OUT)/empty_3.bin + cat $(PRODUCT_OUT)/empty_1.bin $(PRODUCT_OUT)/empty_2.bin $(PRODUCT_OUT)/empty_1.bin $(PRODUCT_OUT)/empty_3.bin > $(PRODUCT_OUT)/super_empty_all.img endif droidcore: $(INSTALLED_MANIFEST_XML) |