StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rebuild and copy recovery patch files when using vendor_otatools" am: 93d7c150c9 am: c4a7031063

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2036543

Change-Id: I012edbcc0f7e851686ac2f3576d7f36c3735eb54
This commit is contained in:
Treehugger Robot
2022-03-22 17:44:23 +00:00
committed by Automerger Merge Worker
parent 3afd8feae8 c4a7031063
commit 07326c0417
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/releasetools/sign_target_files_apks.py
View File

@@ -1278,6 +1278,9 @@ def BuildVendorPartitions(output_zip_path):
vendor_tempdir = common.UnzipTemp(output_zip_path, [
"META/*",
"SYSTEM/build.prop",
"RECOVERY/*",
"BOOT/*",
"OTA/",
] + ["{}/*".format(p.upper()) for p in OPTIONS.vendor_partitions])
# Disable various partitions that build based on misc_info fields.
@@ -1286,9 +1289,12 @@ def BuildVendorPartitions(output_zip_path):
# otatools if necessary.
vendor_misc_info_path = os.path.join(vendor_tempdir, "META/misc_info.txt")
vendor_misc_info = common.LoadDictionaryFromFile(vendor_misc_info_path)
vendor_misc_info["no_boot"] = "true" # boot
vendor_misc_info["vendor_boot"] = "false" # vendor_boot
vendor_misc_info["no_recovery"] = "true" # recovery
# Ignore if not rebuilding recovery
if not OPTIONS.rebuild_recovery:
vendor_misc_info["no_boot"] = "true" # boot
vendor_misc_info["vendor_boot"] = "false" # vendor_boot
vendor_misc_info["no_recovery"] = "true" # recovery
vendor_misc_info["board_bpt_enable"] = "false" # partition-table
vendor_misc_info["has_dtbo"] = "false" # dtbo
vendor_misc_info["has_pvmfw"] = "false" # pvmfw
@@ -1334,6 +1340,9 @@ def BuildVendorPartitions(output_zip_path):
"--verbose",
vendor_tempdir,
]
if OPTIONS.rebuild_recovery:
cmd.insert(4, "--rebuild_recovery")
common.RunAndCheckOutput(cmd, verbose=True)
logger.info("Writing vendor partitions to output archive.")
@@ -1345,6 +1354,12 @@ def BuildVendorPartitions(output_zip_path):
map_file_path = "IMAGES/{}.map".format(p)
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, img_file_path), img_file_path)
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, map_file_path), map_file_path)
# copy recovery patch & install.sh
if OPTIONS.rebuild_recovery:
recovery_patch_path = "VENDOR/recovery-from-boot.p"
recovery_sh_path = "VENDOR/bin/install-recovery.sh"
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, recovery_patch_path), recovery_patch_path)
common.ZipWrite(output_zip, os.path.join(vendor_tempdir, recovery_sh_path), recovery_sh_path)
def main(argv):