Merge "Fix a failure in signing test" am: 936e704999 am: 5c8fc606d4 am: aeba7359a0 am: 86250621a3

Original change: https://android-review.googlesource.com/c/platform/build/+/1879016

Change-Id: Ibe9e6568762f8be2225a8b4e080041d3e53682c1
This commit is contained in:
Treehugger Robot
2021-11-04 10:24:23 +00:00
committed by Automerger Merge Worker
3 changed files with 20 additions and 11 deletions

View File

@@ -3953,3 +3953,10 @@ def AddCareMapForAbOta(output_file, ab_partitions, image_paths):
OPTIONS.replace_updated_files_list.append(care_map_path) OPTIONS.replace_updated_files_list.append(care_map_path)
else: else:
ZipWrite(output_file, temp_care_map, arcname=care_map_path) ZipWrite(output_file, temp_care_map, arcname=care_map_path)
def IsSparseImage(filepath):
with open(filepath, 'rb') as fp:
# Magic for android sparse image format
# https://source.android.com/devices/bootloader/images
return fp.read(4) == b'\x3A\xFF\x26\xED'

View File

@@ -251,6 +251,7 @@ import common
import ota_utils import ota_utils
from ota_utils import (UNZIP_PATTERN, FinalizeMetadata, GetPackageMetadata, from ota_utils import (UNZIP_PATTERN, FinalizeMetadata, GetPackageMetadata,
PropertyFiles, SECURITY_PATCH_LEVEL_PROP_NAME, GetZipEntryOffset) PropertyFiles, SECURITY_PATCH_LEVEL_PROP_NAME, GetZipEntryOffset)
from common import IsSparseImage
import target_files_diff import target_files_diff
from check_target_files_vintf import CheckVintfIfTrebleEnabled from check_target_files_vintf import CheckVintfIfTrebleEnabled
from non_ab_ota import GenerateNonAbOtaPackage from non_ab_ota import GenerateNonAbOtaPackage
@@ -1021,13 +1022,6 @@ def GeneratePartitionTimestampFlagsDowngrade(
] ]
def IsSparseImage(filepath):
with open(filepath, 'rb') as fp:
# Magic for android sparse image format
# https://source.android.com/devices/bootloader/images
return fp.read(4) == b'\x3A\xFF\x26\xED'
def SupportsMainlineGkiUpdates(target_file): def SupportsMainlineGkiUpdates(target_file):
"""Return True if the build supports MainlineGKIUpdates. """Return True if the build supports MainlineGKIUpdates.

View File

@@ -36,7 +36,9 @@ import logging
import os.path import os.path
import re import re
import zipfile import zipfile
from hashlib import sha1 from hashlib import sha1
from common import IsSparseImage
import common import common
import rangelib import rangelib
@@ -71,6 +73,12 @@ def ValidateFileConsistency(input_zip, input_tmp, info_dict):
def CheckAllFiles(which): def CheckAllFiles(which):
logging.info('Checking %s image.', which) logging.info('Checking %s image.', which)
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 # 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, # that doesn't affect the checks below (we will have all the blocks on file,
# unless it's skipped due to the holes). # unless it's skipped due to the holes).