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

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

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

Merge "Revert "releasetools: Allow using futility-host to sign old TF.zip."" into nyc-dev am: b0df1ef7 am: 983c979c
am: bd6d03ab

Change-Id: I488b164ae8c3a93858a293e2a538ff6b8742736c
parents 9c1f17ba bd6d03ab

tools/releasetools/common.py

+1 −7
Original line number Diff line number Diff line
@@ -514,13 +514,7 @@ 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()

    # 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,

    cmd = [info_dict["vboot_signer_cmd"], info_dict["futility"],

           img_unsigned.name, info_dict["vboot_key"] + ".vbpubk",

           info_dict["vboot_key"] + ".vbprivk",

           info_dict["vboot_subkey"] + ".vbprivk",