releasetools: Skip checking files with non-monotonic ranges.

Bug: 79951743
Test: Run validate_target_files.py on target_files.zip that has
      non-monotonic ranges listed in IMAGES/system.map.
Change-Id: I28d3ca6972d361362589cd51e60731af9994a551
Merged-In: I28d3ca6972d361362589cd51e60731af9994a551
(cherry picked from commit d32936d657)
This commit is contained in:
Tao Bao 2018-05-17 19:42:41 -07:00
parent d653d7a02a
commit 74dfbb8588
1 changed files with 7 additions and 0 deletions

View File

@ -87,6 +87,13 @@ def ValidateFileConsistency(input_zip, input_tmp):
# Read the blocks that the file resides. Note that it will contain the
# bytes past the file length, which is expected to be padded with '\0's.
ranges = image.file_map[entry]
# TODO(b/79951650): Handle files with non-monotonic ranges.
if not ranges.monotonic:
logging.warning(
'Skipping %s that has non-monotonic ranges: %s', entry, ranges)
continue
blocks_sha1 = image.RangeSha1(ranges)
# The filename under unpacked directory, such as SYSTEM/bin/sh.