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

Commit a3c3b9bc authored by Tao Bao's avatar Tao Bao
Browse files

releasetools: Unzip all files when generating image archive. 

Commit 7df64c3e starts to call common.LoadInfoDict() when generating
image archive, which reads additional files under BOOT/, RECOVERY/ and
ROOT/. Unzip everything from the target_files.zip.

Bug: 132456827
Test: Run img_from_target_files.py on previously failing
      target_files.zip.
Change-Id: I22ee57c4f765bee9494478bf115b1581877401f4
parent 6311b83c

tools/releasetools/img_from_target_files.py

+4 −2
Original line number Diff line number Diff line
@@ -166,8 +166,10 @@ def main(argv): 


  common.InitLogging()



  OPTIONS.input_tmp = common.UnzipTemp(args[0],

                                       ["IMAGES/*", "OTA/*", "META/*"])

  # We need files under IMAGES/, OTA/, META/ for img_from_target_files.py.

  # However, common.LoadInfoDict() may read additional files under BOOT/,

  # RECOVERY/ and ROOT/. So unzip everything from the target_files.zip.

  OPTIONS.input_tmp = common.UnzipTemp(args[0])

  LoadOptions(OPTIONS.input_tmp)

  output_zip = zipfile.ZipFile(args[1], "w", compression=zipfile.ZIP_DEFLATED,

                               allowZip64=not OPTIONS.sparse_userimages)