p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

am: 983c979c25

Change-Id: I938ee86611ea8c452c07324e2f3c6a9b0180cb7e
This commit is contained in:
Tao Bao 2017-02-21 20:33:25 +00:00 committed by android-build-merger
parent dcaa3eb7dd 983c979c25
commit bd6d03ab18
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/common.py
View File

@ -514,13 +514,7 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None,
elif info_dict.get("vboot", None): elif info_dict.get("vboot", None):
path = "/" + os.path.basename(sourcedir).lower() path = "/" + os.path.basename(sourcedir).lower()
img_keyblock = tempfile.NamedTemporaryFile() img_keyblock = tempfile.NamedTemporaryFile()
# We have switched from the prebuilt futility binary to using the tool cmd = [info_dict["vboot_signer_cmd"], info_dict["futility"],
# (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", img_unsigned.name, info_dict["vboot_key"] + ".vbpubk",
info_dict["vboot_key"] + ".vbprivk", info_dict["vboot_key"] + ".vbprivk",
info_dict["vboot_subkey"] + ".vbprivk", info_dict["vboot_subkey"] + ".vbprivk",