Revert "releasetools: Allow using futility-host to sign old TF.zip."
Broke ryu targets.
This reverts commit 31a0de00a4b44fa1a8ac32c44cf16e609bd70225.
Change-Id: I3ffcdc604a1cb92c86c574b5cd358d0148430d55
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 43e3870..a4862a6 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -497,13 +497,7 @@
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",