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

Commit f9f0a618 authored by Alex Deymo's avatar Alex Deymo Committed by android-build-merger
Browse files

Merge "ota_from_target_files: Include the payload properties." am: db82f727 

am: 07085a51

* commit '07085a51':
  ota_from_target_files: Include the payload properties.
parents 6fca454c 07085a51

tools/releasetools/ota_from_target_files.py

+12 −1
Original line number Diff line number Diff line
@@ -1186,7 +1186,18 @@ def WriteABOTAPackageWithBrilloScript(target_file, output_file, 
  p1.wait()

  assert p1.returncode == 0, "brillo_update_payload sign failed"



  # Add the signed payload file into the zip.

  # 4. Dump the signed payload properties.

  properties_file = common.MakeTempFile(prefix="payload-properties-",

                                        suffix=".txt")

  cmd = ["brillo_update_payload", "properties",

         "--payload", signed_payload_file,

         "--properties_file", properties_file]

  p1 = common.Run(cmd, stdout=subprocess.PIPE)

  p1.wait()

  assert p1.returncode == 0, "brillo_update_payload properties failed"



  # Add the signed payload file and properties into the zip.

  common.ZipWrite(output_zip, properties_file, arcname="payload_properties.txt")

  common.ZipWrite(output_zip, signed_payload_file, arcname="payload.bin",

                  compress_type=zipfile.ZIP_STORED)

  WriteMetadata(metadata, output_zip)