p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am: 511f1b9e97 am: f0e13afd7f am: b4e110ec48 

am: 8433325fba

Change-Id: I956d1f67c5a31886df206b6f64943e5f8073157c
This commit is contained in:
Tao Bao 2017-02-01 16:59:07 +00:00 committed by android-build-merger
parent 6a220471eb 8433325fba
commit f0a0bbb37c
1 changed files with 3 additions and 2 deletions
Show Stats 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.
output_zip = zipfile.ZipFile(temp_signing, "a",
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.
WriteMetadata(metadata, output_zip)
@ -1432,7 +1433,7 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file,
# Reopen the signed zip to double check the streaming metadata.
output_zip = zipfile.ZipFile(output_file, "r")
assert (metadata['streaming-property-files'] ==
assert (metadata['ota-streaming-property-files'] ==
ComputeStreamingMetadata(output_zip)), \
"Mismatching streaming metadata."
common.ZipClose(output_zip)