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

Merge "Calculate max_stashed_blocks correctly for block OTA v3"

Browse Source
This commit is contained in:
Sami Tolvanen
2015-04-17 18:43:51 +00:00
committed by Gerrit Code Review
parent 1d8f780c7d 29f529f33e
commit 586b38cc39
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/blockimgdiff.py
View File

@@ -396,6 +396,12 @@ class BlockImageDiff(object):
xf.style,
xf.tgt_ranges.to_string_raw(), src_str))
elif self.version >= 3:
# take into account automatic stashing of overlapping blocks
if xf.src_ranges.overlaps(xf.tgt_ranges):
temp_stash_usage = stashed_blocks + xf.src_ranges.size();
if temp_stash_usage > max_stashed_blocks:
max_stashed_blocks = temp_stash_usage
out.append("%s %s %s %s\n" % (
xf.style,
self.HashBlocks(self.tgt, xf.tgt_ranges),
@@ -414,6 +420,12 @@ class BlockImageDiff(object):
xf.style, xf.patch_start, xf.patch_len,
xf.tgt_ranges.to_string_raw(), src_str))
elif self.version >= 3:
# take into account automatic stashing of overlapping blocks
if xf.src_ranges.overlaps(xf.tgt_ranges):
temp_stash_usage = stashed_blocks + xf.src_ranges.size();
if temp_stash_usage > max_stashed_blocks:
max_stashed_blocks = temp_stash_usage
out.append("%s %d %d %s %s %s %s\n" % (
xf.style,
xf.patch_start, xf.patch_len,