StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "releasetools: Explicitly pass the SHA-1 of source boot image to PatchCheck."

Browse Source
This commit is contained in:
Tao Bao
2018-06-13 17:20:36 +00:00
committed by Gerrit Code Review
parent cfbe8cf3bb 6d8ec5803b
commit 50869f203a
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/ota_from_target_files.py
View File

@@ -1517,10 +1517,16 @@ else if get_stage("%(bcb_dev)s") != "3/3" then
common.ZipWriteStr(output_zip, "patch/boot.img.p", d) common.ZipWriteStr(output_zip, "patch/boot.img.p", d)
# TODO(b/110106408): Remove after properly handling the SHA-1 embedded in
# the filename argument in updater code. Prior to that, explicitly list
# the SHA-1 of the source image, in case the updater tries to find a
# matching backup from /cache. Similarly for the call to
# script.ApplyPatch() below.
script.PatchCheck("%s:%s:%d:%s:%d:%s" % script.PatchCheck("%s:%s:%d:%s:%d:%s" %
(boot_type, boot_device, (boot_type, boot_device,
source_boot.size, source_boot.sha1, source_boot.size, source_boot.sha1,
target_boot.size, target_boot.sha1)) target_boot.size, target_boot.sha1),
source_boot.sha1)
size.append(target_boot.size) size.append(target_boot.size)
if size: if size: