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

am 5ffff55b: am 10b2e62b: Merge "releasetools: Don\'t write empty groups."

Browse Source 
* commit '5ffff55bbd5770dfc3e7586396c326f97c7b2b47':
  releasetools: Don't write empty groups.
This commit is contained in:
Tao Bao
2015-09-08 22:38:35 +00:00
committed by Android Git Automerger
parent cb3640a1d3 5ffff55bbd
commit 484617a79a
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/releasetools/blockimgdiff.py
View File

@@ -128,10 +128,10 @@ class DataImage(Image):
# verification if it has non-zero contents in the padding bytes. # verification if it has non-zero contents in the padding bytes.
# Bug: 23828506 # Bug: 23828506
if padded: if padded:
self.clobbered_blocks = RangeSet( clobbered_blocks = [self.total_blocks-1, self.total_blocks]
data=(self.total_blocks-1, self.total_blocks))
else: else:
self.clobbered_blocks = RangeSet() clobbered_blocks = []
self.clobbered_blocks = clobbered_blocks
self.extended = RangeSet() self.extended = RangeSet()
zero_blocks = [] zero_blocks = []
@@ -147,11 +147,15 @@ class DataImage(Image):
nonzero_blocks.append(i) nonzero_blocks.append(i)
nonzero_blocks.append(i+1) nonzero_blocks.append(i+1)
self.file_map = {"__ZERO": RangeSet(zero_blocks), assert zero_blocks or nonzero_blocks or clobbered_blocks
"__NONZERO": RangeSet(nonzero_blocks)}
if self.clobbered_blocks: self.file_map = dict()
self.file_map["__COPY"] = self.clobbered_blocks if zero_blocks:
self.file_map["__ZERO"] = RangeSet(data=zero_blocks)
if nonzero_blocks:
self.file_map["__NONZERO"] = RangeSet(data=nonzero_blocks)
if clobbered_blocks:
self.file_map["__COPY"] = RangeSet(data=clobbered_blocks)
def ReadRangeSet(self, ranges): def ReadRangeSet(self, ranges):
return [self.data[s*self.blocksize:e*self.blocksize] for (s, e) in ranges] return [self.data[s*self.blocksize:e*self.blocksize] for (s, e) in ranges]