Use AVB footer to determine caremap
Care maps need to store the original image size, which excludes bytes used by hash tree or FEC code. We used to propagate original image size using the global OPTIONS dictionary. This is bad coding practice, and also fragile because we have to make sure what's stored in dictionary and what's on disk are consistent. Instead, let's read the content of images on disk, and parse the AVB footer. The AVB footer contains the ground truth original image size. Test: build OTA, make sure the care maps have valid range Bug: 246504616 Change-Id: I9250b478ab34dda60578a6b8c23ae6d7a9385788
This commit is contained in:
@@ -2865,7 +2865,7 @@ def ZipWriteStr(zip_file, zinfo_or_arcname, data, perms=None,
|
||||
zipfile.ZIP64_LIMIT = saved_zip64_limit
|
||||
|
||||
|
||||
def ZipDelete(zip_filename, entries):
|
||||
def ZipDelete(zip_filename, entries, force=False):
|
||||
"""Deletes entries from a ZIP file.
|
||||
|
||||
Since deleting entries from a ZIP file is not supported, it shells out to
|
||||
@@ -2883,8 +2883,15 @@ def ZipDelete(zip_filename, entries):
|
||||
# If list is empty, nothing to do
|
||||
if not entries:
|
||||
return
|
||||
cmd = ["zip", "-d", zip_filename] + entries
|
||||
RunAndCheckOutput(cmd)
|
||||
if force:
|
||||
cmd = ["zip", "-q", "-d", zip_filename] + entries
|
||||
else:
|
||||
cmd = ["zip", "-d", zip_filename] + entries
|
||||
if force:
|
||||
p = Run(cmd)
|
||||
p.wait()
|
||||
else:
|
||||
RunAndCheckOutput(cmd)
|
||||
|
||||
|
||||
def ZipClose(zip_file):
|
||||
@@ -3979,6 +3986,8 @@ def GetBootImageTimestamp(boot_img):
|
||||
|
||||
|
||||
def IsSparseImage(filepath):
|
||||
if not os.path.exists(filepath):
|
||||
return False
|
||||
with open(filepath, 'rb') as fp:
|
||||
# Magic for android sparse image format
|
||||
# https://source.android.com/devices/bootloader/images
|
||||
|
Reference in New Issue
Block a user