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

Fix a failure in signing test

Browse Source 
Pixel moved away from sparse images, so validate_target_files is failing
because it expects sparse images.

Test: th
Change-Id: I322ff10c2afbacfb4d78991be60c11aac92a6d4c
This commit is contained in:
Kelvin Zhang
2021-11-02 14:31:10 -07:00
parent 1e392720c2
commit 2639048c21
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/releasetools/validate_target_files.py
View File

@@ -36,7 +36,9 @@ import logging
import os.path
import re
import zipfile
from hashlib import sha1
from common import IsSparseImage
import common
import rangelib
@@ -71,10 +73,16 @@ def ValidateFileConsistency(input_zip, input_tmp, info_dict):
def CheckAllFiles(which):
logging.info('Checking %s image.', which)
# Allow having shared blocks when loading the sparse image, because allowing
# that doesn't affect the checks below (we will have all the blocks on file,
# unless it's skipped due to the holes).
image = common.GetSparseImage(which, input_tmp, input_zip, True)
path = os.path.join(input_tmp, "IMAGES", which + ".img")
if not IsSparseImage(path):
logging.info("%s is non-sparse image", which)
image = common.GetNonSparseImage(which, input_tmp)
else:
logging.info("%s is sparse image", which)
# Allow having shared blocks when loading the sparse image, because allowing
# that doesn't affect the checks below (we will have all the blocks on file,
# unless it's skipped due to the holes).
image = common.GetSparseImage(which, input_tmp, input_zip, True)
prefix = '/' + which
for entry in image.file_map:
# Skip entries like '__NONZERO-0'.