diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-05 01:07:58 +0000 |
| commit | 766a518ae6de4b81c4fc139f90b51521a2f681b7 (patch) | |
| tree | e694616b3a0c42642ed38f396cba9ba5e5ff8671 /tools/releasetools/common.py | |
| parent | 5cd236c279a16120cabc9e334285277f9e79f213 (diff) | |
| parent | 358c8909f5dd043f9d8bfee61f567701946dc19a (diff) | |
| download | build-766a518ae6de4b81c4fc139f90b51521a2f681b7.zip build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.gz build-766a518ae6de4b81c4fc139f90b51521a2f681b7.tar.bz2 | |
Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
Conflicts:
core/Makefile
core/build_id.mk
tools/releasetools/ota_from_target_files.py
Change-Id: Ia1404ee9cd931a6540ea0dd3e2aa7b32d649e80c
Diffstat (limited to 'tools/releasetools/common.py')
| -rw-r--r-- | tools/releasetools/common.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 36f3305..d13f82a 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -422,7 +422,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() |