| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 04:55:45 (GMT) |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2020-06-03 04:55:45 (GMT) |
| commit | 4f57475bb23ed8e5e48027e8c70b14d5d4795125 (patch) | |
| tree | 1cf79ecdc1d5efd4056a3accf3f61949a89bf76e | |
| parent | 86fe83d11dc2b87302dd276442ab6691955e8120 (diff) | |
| parent | b20a3fd955e444ac791897f34f93ff5ad77a8ee9 (diff) | |
| download | common-4f57475bb23ed8e5e48027e8c70b14d5d4795125.zip common-4f57475bb23ed8e5e48027e8c70b14d5d4795125.tar.gz common-4f57475bb23ed8e5e48027e8c70b14d5d4795125.tar.bz2 | |
Merge "ota: write super_empty_all.img when partition change [1/1]" into q-tv-r1-dev
| -rwxr-xr-x | factory.mk | 6 | ||||
| -rwxr-xr-x | releasetools.py | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -692,7 +692,7 @@ $(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) $(INTERNAL_OTA_PACKAGE_TARGET) +$(AML_TARGET_ZIP): $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(TARGET_USB_BURNING_V2_DEPEND_MODULES) 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 @@ -705,14 +705,16 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true) #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 endif droidcore: $(INSTALLED_MANIFEST_XML) ifneq ($(BUILD_AMLOGIC_FACTORY_ZIP), false) droidcore: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_AML_FASTBOOT_ZIP) -otapackage: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) endif +$(INTERNAL_OTA_PACKAGE_TARGET): $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(AML_TARGET_ZIP) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) + .PHONY: aml_factory_zip aml_factory_zip: $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(INSTALLED_MANIFEST_XML) $(INSTALLED_AML_FASTBOOT_ZIP) diff --git a/releasetools.py b/releasetools.py index 6d0da2f..5028b20 100755 --- a/releasetools.py +++ b/releasetools.py @@ -183,6 +183,10 @@ def FullOTA_InstallBegin(info): else: SetBootloaderEnv(info.script, "upgrade_step", "3") info.script.FormatPartition("/metadata") + ZipOtherImage("super_empty_all", OPTIONS.input_tmp, info.output_zip) + info.script.AppendExtra('if get_update_stage() == "2" then') + info.script.AppendExtra('package_extract_file("super_empty_all.img", "/dev/block/super");') + info.script.AppendExtra('endif;') info.script.AppendExtra('delete_file("/cache/recovery/dynamic_partition_metadata.UPDATED");') def FullOTA_InstallEnd(info): |