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

Commit bf817c9f authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Add apex_info.pb to generated OTA" am: a7f2857f 

Original change: https://android-review.googlesource.com/c/platform/build/+/1556919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I78db36c2dc76e1c01153dda01673aa05041b80d6
parents 1f6c6a17 a7f2857f

tools/releasetools/ota_from_target_files.py

+9 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,15 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): 
    else:

      logger.warning("Cannot find care map file in target_file package")



  # Copy apex_info.pb over to generated OTA package.

  try:

    apex_info_entry = target_zip.getinfo("META/apex_info.pb")

    with target_zip.open(apex_info_entry, "r") as zfp:

      common.ZipWriteStr(output_zip, "apex_info.pb", zfp.read(),

                        compress_type=zipfile.ZIP_STORED)

  except KeyError:

    logger.warning("target_file doesn't contain apex_info.pb %s", target_file)



  common.ZipClose(target_zip)



  CheckVintfIfTrebleEnabled(target_file, target_info)