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

Merge "releasetools: Skip validating non-sparse images."

Browse Source
This commit is contained in:
Tao Bao
2018-05-14 17:37:53 +00:00
committed by Gerrit Code Review
parent 198b9f4f6a 63e2f49fdd
commit 138df4ef77
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/validate_target_files.py
View File

@@ -66,7 +66,7 @@ def ValidateFileAgainstSha1(input_tmp, file_name, file_path, expected_sha1):
file_name, actual_sha1, expected_sha1)
def ValidateFileConsistency(input_zip, input_tmp):
def ValidateFileConsistency(input_zip, input_tmp, info_dict):
"""Compare the files from image files and unpacked folders."""
def CheckAllFiles(which):
@@ -103,6 +103,11 @@ def ValidateFileConsistency(input_zip, input_tmp):
logging.info('Validating file consistency.')
# TODO(b/79617342): Validate non-sparse images.
if info_dict.get('extfs_sparse_flag') != '-s':
logging.warning('Skipped due to target using non-sparse images')
return
# Verify IMAGES/system.img.
CheckAllFiles('system')
@@ -324,10 +329,10 @@ def main():
logging.info("Unzipping the input target_files.zip: %s", args.target_files)
input_tmp = common.UnzipTemp(args.target_files)
with zipfile.ZipFile(args.target_files, 'r') as input_zip:
ValidateFileConsistency(input_zip, input_tmp)
info_dict = common.LoadInfoDict(input_tmp)
with zipfile.ZipFile(args.target_files, 'r') as input_zip:
ValidateFileConsistency(input_zip, input_tmp, info_dict)
ValidateInstallRecoveryScript(input_tmp, info_dict)
ValidateVerifiedBootImages(input_tmp, info_dict, options)