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

resolved conflicts for merge of 8787cd6d to mnc-dev

Browse Source 
Change-Id: I19497d05a021c21c905b2bddd5b36d370dc2208f
This commit is contained in:
Tao Bao
2015-07-01 18:06:33 -07:00
parent c7a6f1e4f8 8787cd6d4e
commit 8bd720257e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/sparse_img.py
View File

@@ -221,8 +221,13 @@ class SparseImage(object):
nonzero_blocks.append(b) nonzero_blocks.append(b)
nonzero_blocks.append(b+1) nonzero_blocks.append(b+1)
assert zero_blocks or nonzero_blocks or clobbered_blocks
if zero_blocks:
out["__ZERO"] = rangelib.RangeSet(data=zero_blocks) out["__ZERO"] = rangelib.RangeSet(data=zero_blocks)
if nonzero_blocks:
out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks) out["__NONZERO"] = rangelib.RangeSet(data=nonzero_blocks)
if clobbered_blocks:
out["__COPY"] = clobbered_blocks out["__COPY"] = clobbered_blocks
def ResetFileMap(self): def ResetFileMap(self):