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

Commit 77620b5a authored by Tao Bao's avatar Tao Bao
Browse files

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

This reverts commit d6145b6a.

The cause of the earlier breakage has been identified and fixed by
commit 4b577413.

Bug: 35467608
Test: lunch ryu-userdebug; m dist otatools-package
(cherry picked from commit 4f30f7cf)
parent 69ad150d

tools/releasetools/common.py

+7 −1
Original line number Diff line number Diff line
@@ -497,7 +497,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",