Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa33518 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Revert "Revert "releasetools: Allow using futility-host to sign old TF.zip."" am: 77620b5a

am: 9eea2cde

Change-Id: Ib5c77170d06bfe4f2289d2565e9e56b8b3c0b080
parents 98eb433d 9eea2cde
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -514,7 +514,13 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None,
  elif info_dict.get("vboot", None):
    path = "/" + os.path.basename(sourcedir).lower()
    img_keyblock = tempfile.NamedTemporaryFile()
    cmd = [info_dict["vboot_signer_cmd"], info_dict["futility"],
    # 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",