p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Skip validating non-sparse images." am: 138df4ef77 

am: 30846b5745

Change-Id: If0130952f0c6723ed74931a6ba7e7b977176f2f4
This commit is contained in:
Tao Bao 2018-05-14 10:53:11 -07:00 committed by android-build-merger
parent b657d5ce62 30846b5745
commit 143d0925d9
1 changed files with 9 additions and 4 deletions
Show Stats 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) 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.""" """Compare the files from image files and unpacked folders."""
def CheckAllFiles(which): def CheckAllFiles(which):
@ -103,6 +103,11 @@ def ValidateFileConsistency(input_zip, input_tmp):
logging.info('Validating file consistency.') 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. # Verify IMAGES/system.img.
CheckAllFiles('system') CheckAllFiles('system')
@ -324,10 +329,10 @@ def main():
logging.info("Unzipping the input target_files.zip: %s", args.target_files) logging.info("Unzipping the input target_files.zip: %s", args.target_files)
input_tmp = common.UnzipTemp(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) 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) ValidateInstallRecoveryScript(input_tmp, info_dict)
ValidateVerifiedBootImages(input_tmp, info_dict, options) ValidateVerifiedBootImages(input_tmp, info_dict, options)