diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-04-17 19:30:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-17 19:30:23 +0000 |
| commit | 8f9f7c0672b2fb628e0108088729ffadb0a41092 (patch) | |
| tree | 6441cc1c893ce32d23babaaa77fd7474d6c4cf5d /tools/releasetools | |
| parent | 5da97b217a997d5bfb78595e3a8ca71988803dcc (diff) | |
| parent | c4d303e958e1f3475fd1070bdb307b4f675f3bdd (diff) | |
| download | build-8f9f7c0672b2fb628e0108088729ffadb0a41092.zip build-8f9f7c0672b2fb628e0108088729ffadb0a41092.tar.gz build-8f9f7c0672b2fb628e0108088729ffadb0a41092.tar.bz2 | |
am c4d303e9: am 7788547f: am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"
* commit 'c4d303e958e1f3475fd1070bdb307b4f675f3bdd':
Calculate max_stashed_blocks correctly for block OTA v3
Diffstat (limited to 'tools/releasetools')
| -rw-r--r-- | tools/releasetools/blockimgdiff.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py index 50d9d3f..544b1d0 100644 --- a/tools/releasetools/blockimgdiff.py +++ b/tools/releasetools/blockimgdiff.py @@ -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, |