Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20a86cdd authored by Tianjie Xu's avatar Tianjie Xu
Browse files

Iterate through the sorted file map when finding transfers 

This helps to generate a deterministic package.

Bug: 71770360
Test: Generate a incremental package and transfers are added by file name.
Change-Id: I7562a200b97a1babbb09a77801324cc9408cc01f
parent d3bf67e1

tools/releasetools/blockimgdiff.py

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ class BlockImageDiff(object): 
    max_blocks_per_transfer = int(cache_size * split_threshold /

                                  self.tgt.blocksize)

    empty = RangeSet()

    for tgt_fn, tgt_ranges in self.tgt.file_map.items():

    for tgt_fn, tgt_ranges in sorted(self.tgt.file_map.items()):

      if tgt_fn == "__ZERO":

        # the special "__ZERO" domain is all the blocks not contained

        # in any file and that are filled with zeros.  We have a