summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2015-08-10 19:34:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-10 19:34:16 +0000
commitf8a714ba6f1bfbb7abc7eeeba439be42e76b7f21 (patch)
tree8d1b4e2adefa9aca4d0ac4197fa0773344046e69 /tools
parentc4904316ad9a1f84ffd9de43cf82eb452b5d8556 (diff)
parent9f5c487ef586d20c273cafba6ce663287ef6a37a (diff)
downloadbuild-f8a714ba6f1bfbb7abc7eeeba439be42e76b7f21.zip
build-f8a714ba6f1bfbb7abc7eeeba439be42e76b7f21.tar.gz
build-f8a714ba6f1bfbb7abc7eeeba439be42e76b7f21.tar.bz2
am 9f5c487e: Merge "releasetools: Fix parameters for vboot_signer" into mnc-dr-dev
* commit '9f5c487ef586d20c273cafba6ce663287ef6a37a': releasetools: Fix parameters for vboot_signer
Diffstat (limited to 'tools')
-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 a720abb..3c3d2ed 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()