From bfdcb1257cbb1acd91fe546b7c91a3277154211a Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Tue, 31 Jan 2017 15:06:05 -0800 Subject: [PATCH] releasetools: Prepend 'ota-' to 'streaming-property-files'. '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 --- tools/releasetools/ota_from_target_files.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 73104701c..bd033eb6d 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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)