commit 7788547ff34d93b5196933eedb9f006fb1fe9f4d
author Sami Tolvanen <samitolvanen@google.com> Fri Apr 17 18:52:57 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 17 18:52:57 2015 +0000
tree 94ed3df48f1a85476a14a2f8ed6de8998292afd1
parent 7a1d29eb4bea37a4f043330cf722f720103129b8
parent 586b38cc397758848dbfc09351cadd39b89b9e49

am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"

* commit '586b38cc397758848dbfc09351cadd39b89b9e49':
  Calculate max_stashed_blocks correctly for block OTA v3

tools/releasetools/blockimgdiff.py

diff --git a/tools/releasetools/blockimgdiff.py b/tools/releasetools/blockimgdiff.py
index 75379cd..8eb249a 100644
--- a/tools/releasetools/blockimgdiff.py
+++ b/tools/releasetools/blockimgdiff.py
@@ -396,6 +396,12 @@
                 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 @@
               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,