commit de72054e03d00981e7e44d6e92dae85e94d39d56
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 17:43:17 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 21 17:43:17 2020 +0000
tree a3f90e9cc3105b590da09b62c95070107cffce65
parent 19c6758950a52200f350b09f319acd5333d8ef3b
parent 4969b45d50cadf15be69eee5e8dc55d82ab8e7cd

Merge "Exclude holes from the block map." am: 9581181338 am: 4969b45d50

Change-Id: Idf4cf41cdcf58dcb0a905b2082ae6255fea26002

tools/releasetools/sparse_img.py

diff --git a/tools/releasetools/sparse_img.py b/tools/releasetools/sparse_img.py
index a249081..6a91cf4 100644
--- a/tools/releasetools/sparse_img.py
+++ b/tools/releasetools/sparse_img.py
@@ -251,6 +251,12 @@
       for line in f:
         fn, ranges_text = line.rstrip().split(None, 1)
         ranges = rangelib.RangeSet.parse(ranges_text)
+
+        # Note: e2fsdroid records holes in the extent tree as "0" blocks.
+        # This causes confusion because clobbered_blocks always includes
+        # the superblock (physical block #0). Since the 0 blocks here do
+        # not represent actual physical blocks, remove them from the set.
+        ranges = ranges.subtract(rangelib.RangeSet("0"))
         ranges.extra['text_str'] = ranges_text
 
         if allow_shared_blocks: