Drop legacy vboot support.
Bug: 291329969 Bug: 347885843 Bug: 347899892 Test: m Test: CIs (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5071b95a067c9392b7bfa4d95957307ff0ccdcc3) Merged-In: I5f30f63553cc2670650897e259ba51baf8ced05d Change-Id: I5f30f63553cc2670650897e259ba51baf8ced05d
This commit is contained in:
@@ -1784,12 +1784,7 @@ def _BuildBootableImage(image_name, sourcedir, fs_config_file,
|
||||
if has_ramdisk:
|
||||
cmd.extend(["--ramdisk", ramdisk_img.name])
|
||||
|
||||
img_unsigned = None
|
||||
if info_dict.get("vboot"):
|
||||
img_unsigned = tempfile.NamedTemporaryFile()
|
||||
cmd.extend(["--output", img_unsigned.name])
|
||||
else:
|
||||
cmd.extend(["--output", img.name])
|
||||
cmd.extend(["--output", img.name])
|
||||
|
||||
if partition_name == "recovery":
|
||||
if info_dict.get("include_recovery_dtbo") == "true":
|
||||
@@ -1801,28 +1796,6 @@ def _BuildBootableImage(image_name, sourcedir, fs_config_file,
|
||||
|
||||
RunAndCheckOutput(cmd)
|
||||
|
||||
# Sign the image if vboot is non-empty.
|
||||
if info_dict.get("vboot"):
|
||||
path = "/" + partition_name
|
||||
img_keyblock = tempfile.NamedTemporaryFile()
|
||||
# We have switched from the prebuilt futility binary to using the tool
|
||||
# (futility-host) built from the source. Override the setting in the old
|
||||
# TF.zip.
|
||||
futility = info_dict["futility"]
|
||||
if futility.startswith("prebuilts/"):
|
||||
futility = "futility-host"
|
||||
cmd = [info_dict["vboot_signer_cmd"], futility,
|
||||
img_unsigned.name, info_dict["vboot_key"] + ".vbpubk",
|
||||
info_dict["vboot_key"] + ".vbprivk",
|
||||
info_dict["vboot_subkey"] + ".vbprivk",
|
||||
img_keyblock.name,
|
||||
img.name]
|
||||
RunAndCheckOutput(cmd)
|
||||
|
||||
# Clean up the temp files.
|
||||
img_unsigned.close()
|
||||
img_keyblock.close()
|
||||
|
||||
# AVB: if enabled, calculate and add hash to boot.img or recovery.img.
|
||||
if info_dict.get("avb_enable") == "true":
|
||||
avbtool = info_dict["avb_avbtool"]
|
||||
|
Reference in New Issue
Block a user