Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0a0bbb3 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am:... 

Merge "releasetools: Prepend 'ota-' to 'streaming-property-files'." am: 511f1b9e am: f0e13afd am: b4e110ec
am: 8433325f

Change-Id: I956d1f67c5a31886df206b6f64943e5f8073157c
parents 6a220471 8433325f

tools/releasetools/ota_from_target_files.py

+3 −2
Original line number Diff line number Diff line
@@ -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)