From d6145b6a160a7c171269d9408a675d8ff4f08283 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 21 Feb 2017 20:27:27 +0000 Subject: [PATCH] Revert "releasetools: Allow using futility-host to sign old TF.zip." Broke ryu targets. This reverts commit 31a0de00a4b44fa1a8ac32c44cf16e609bd70225. Change-Id: I3ffcdc604a1cb92c86c574b5cd358d0148430d55 --- tools/releasetools/common.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 43e387068..a4862a6ab 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -497,13 +497,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",