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

Commit 4923bede authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime Committed by Automerger Merge Worker
Browse files

Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am:... 

Merge "Rebuild and copy recovery and boot img when using vendor_otatools" am: 71585eae am: 7ee275cb am: 9fd594c5 am: 42a71603

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



Change-Id: I2d8fdc61f2298c9ced71e618254efeb87aae6f45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41334adb 42a71603

tools/releasetools/sign_target_files_apks.py

+7 −2
Original line number Diff line number Diff line
@@ -1295,12 +1295,13 @@ def BuildVendorPartitions(output_zip_path): 
    vendor_misc_info["no_boot"] = "true"  # boot

    vendor_misc_info["vendor_boot"] = "false"  # vendor_boot

    vendor_misc_info["no_recovery"] = "true"  # recovery

    vendor_misc_info["avb_enable"] = "false"  # vbmeta



  vendor_misc_info["board_bpt_enable"] = "false"  # partition-table

  vendor_misc_info["has_dtbo"] = "false"  # dtbo

  vendor_misc_info["has_pvmfw"] = "false"  # pvmfw

  vendor_misc_info["avb_custom_images_partition_list"] = ""  # custom images

  vendor_misc_info["avb_enable"] = "false"  # vbmeta

  vendor_misc_info["avb_building_vbmeta_image"] = "false" # skip building vbmeta

  vendor_misc_info["use_dynamic_partitions"] = "false"  # super_empty

  vendor_misc_info["build_super_partition"] = "false"  # super split

  with open(vendor_misc_info_path, "w") as output:
@@ -1355,8 +1356,12 @@ def BuildVendorPartitions(output_zip_path): 
      map_file_path = "IMAGES/{}.map".format(p)

      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, img_file_path), img_file_path)

      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, map_file_path), map_file_path)

    # copy recovery patch & install.sh

    # copy recovery.img, boot.img, recovery patch & install.sh

    if OPTIONS.rebuild_recovery:

      recovery_img = "IMAGES/recovery.img"

      boot_img = "IMAGES/boot.img"

      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, recovery_img), recovery_img)

      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, boot_img), boot_img)

      recovery_patch_path = "VENDOR/recovery-from-boot.p"

      recovery_sh_path = "VENDOR/bin/install-recovery.sh"

      common.ZipWrite(output_zip, os.path.join(vendor_tempdir, recovery_patch_path), recovery_patch_path)