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

Merge "A/B update: Replace the zip FileHeader mechanism for update package"

Browse Source
This commit is contained in:
Tao Bao
2018-08-24 19:54:10 +00:00
committed by Gerrit Code Review
parent 6861c9f98d 338856f92b
commit 22f28aa1b5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/ota_from_target_files.py
View File

@@ -1096,7 +1096,9 @@ class PropertyFiles(object):
def ComputeEntryOffsetSize(name): def ComputeEntryOffsetSize(name):
"""Computes the zip entry offset and size.""" """Computes the zip entry offset and size."""
info = zip_file.getinfo(name) info = zip_file.getinfo(name)
offset = info.header_offset + len(info.FileHeader()) offset = info.header_offset
offset += zipfile.sizeFileHeader
offset += len(info.extra) + len(info.filename)
size = info.file_size size = info.file_size
return '%s:%d:%d' % (os.path.basename(name), offset, size) return '%s:%d:%d' % (os.path.basename(name), offset, size)
@@ -1220,7 +1222,9 @@ class AbOtaPropertyFiles(StreamingPropertyFiles):
payload, till the end of 'medatada_signature_message'. payload, till the end of 'medatada_signature_message'.
""" """
payload_info = input_zip.getinfo('payload.bin') payload_info = input_zip.getinfo('payload.bin')
payload_offset = payload_info.header_offset + len(payload_info.FileHeader()) payload_offset = payload_info.header_offset
payload_offset += zipfile.sizeFileHeader
payload_offset += len(payload_info.extra) + len(payload_info.filename)
payload_size = payload_info.file_size payload_size = payload_info.file_size
with input_zip.open('payload.bin', 'r') as payload_fp: with input_zip.open('payload.bin', 'r') as payload_fp: