summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2015-08-10 19:27:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-10 19:27:36 +0000
commit9f5c487ef586d20c273cafba6ce663287ef6a37a (patch)
treea3244333acee56fb991683daf01d452986a218d6
parentffe86de5d04ad7a71c2d48478d85b39db5c441eb (diff)
parent852b8de43f3ce6d4f36efec00b570a71e7bb250e (diff)
downloadbuild-9f5c487ef586d20c273cafba6ce663287ef6a37a.zip
build-9f5c487ef586d20c273cafba6ce663287ef6a37a.tar.gz
build-9f5c487ef586d20c273cafba6ce663287ef6a37a.tar.bz2
Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
-rw-r--r--tools/releasetools/common.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 99b319d..ebf47cb 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -390,7 +390,9 @@ def BuildBootableImage(sourcedir, fs_config_file, info_dict=None):
img_keyblock = tempfile.NamedTemporaryFile()
cmd = [info_dict["vboot_signer_cmd"], info_dict["futility"],
img_unsigned.name, info_dict["vboot_key"] + ".vbpubk",
- info_dict["vboot_key"] + ".vbprivk", img_keyblock.name,
+ info_dict["vboot_key"] + ".vbprivk",
+ info_dict["vboot_subkey"] + ".vbprivk",
+ img_keyblock.name,
img.name]
p = Run(cmd, stdout=subprocess.PIPE)
p.communicate()