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

Commit b62c0fdc authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix non-AB OTA signing issue"

parents b8470994 f80e8862

tools/releasetools/non_ab_ota.py

+2 −2
Original line number Original line Diff line number Diff line
@@ -282,7 +282,7 @@ endif; 
  needed_property_files = (

  needed_property_files = (

      NonAbOtaPropertyFiles(),

      NonAbOtaPropertyFiles(),

  )

  )

  FinalizeMetadata(metadata, staging_file, output_file, needed_property_files)

  FinalizeMetadata(metadata, staging_file, output_file, needed_property_files, package_key=OPTIONS.package_key)









def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_file):

def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_file):
@@ -537,7 +537,7 @@ endif; 
  needed_property_files = (

  needed_property_files = (

      NonAbOtaPropertyFiles(),

      NonAbOtaPropertyFiles(),

  )

  )

  FinalizeMetadata(metadata, staging_file, output_file, needed_property_files)

  FinalizeMetadata(metadata, staging_file, output_file, needed_property_files, package_key=OPTIONS.package_key)









def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):

def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):

tools/releasetools/ota_utils.py

+2 −0
Original line number Original line Diff line number Diff line
@@ -132,8 +132,10 @@ def FinalizeMetadata(metadata, input_file, output_file, needed_property_files=No 




  # Re-sign the package after updating the metadata entry.

  # Re-sign the package after updating the metadata entry.

  if no_signing:

  if no_signing:

    logger.info(f"Signing disabled for output file {output_file}")

    shutil.copy(prelim_signing, output_file)

    shutil.copy(prelim_signing, output_file)

  else:

  else:

    logger.info(f"Signing the output file {output_file} with key {package_key}")

    SignOutput(prelim_signing, output_file, package_key, pw)

    SignOutput(prelim_signing, output_file, package_key, pw)





  # Reopen the final signed zip to double check the streaming metadata.

  # Reopen the final signed zip to double check the streaming metadata.