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

releasetools: Prepend 'ota-' to 'streaming-property-files'.

Browse Source 
'streaming-property-files' is a property related to the OTA package
itself. Prepend 'ota-' to make it consistent with others like
'ota-type' and 'ota-required-cache'.

Bug: 34852392
Test: Generate an A/B OTA package and check METADATA entry.
Change-Id: Ia681e6e19ff509e6da0d8718933b42aac997e1cf
This commit is contained in:
Tao Bao
2017-01-31 15:06:05 -08:00
parent b1201637a4
commit bfdcb1257c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/ota_from_target_files.py
View File

@@ -1418,7 +1418,8 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
# Open the signed zip. Compute the metadata that's needed for streaming. # Open the signed zip. Compute the metadata that's needed for streaming.
output_zip = zipfile.ZipFile(temp_signing, "a", output_zip = zipfile.ZipFile(temp_signing, "a",
compression=zipfile.ZIP_DEFLATED) compression=zipfile.ZIP_DEFLATED)
metadata['streaming-property-files'] = ComputeStreamingMetadata(output_zip) metadata['ota-streaming-property-files'] = ComputeStreamingMetadata(
output_zip)
# Write the metadata entry into the zip. # Write the metadata entry into the zip.
WriteMetadata(metadata, output_zip) WriteMetadata(metadata, output_zip)
@@ -1432,7 +1433,7 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
# Reopen the signed zip to double check the streaming metadata. # Reopen the signed zip to double check the streaming metadata.
output_zip = zipfile.ZipFile(output_file, "r") output_zip = zipfile.ZipFile(output_file, "r")
assert (metadata['streaming-property-files'] == assert (metadata['ota-streaming-property-files'] ==
ComputeStreamingMetadata(output_zip)), \ ComputeStreamingMetadata(output_zip)), \
"Mismatching streaming metadata." "Mismatching streaming metadata."
common.ZipClose(output_zip) common.ZipClose(output_zip)