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

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

releasetools: Fix the reference to OPTIONS.info_dict. 

sign_target_files_apks.py calls common.GetBootableImage() but without
calling 'OPTIONS = common.OPTIONS' first. In common.GetBootableImage(),
we should use the local info_dict parameter instead of OPTIONS.info_dict.

Test: sign_target_files_apks.py generates signed-TF.zip successfully.

Change-Id: Ia3d32b88691c26e5fb98feea709e3e3c3eb70fdb
parent 8ee6d119

tools/releasetools/common.py

+3 −3
Original line number Diff line number Diff line
@@ -514,13 +514,13 @@ def _BuildBootableImage(sourcedir, fs_config_file, info_dict=None, 
    img_keyblock.close()



  # AVB: if enabled, calculate and add hash to boot.img.

  if OPTIONS.info_dict.get("board_avb_enable", None) == "true":

  if info_dict.get("board_avb_enable", None) == "true":

    avbtool = os.getenv('AVBTOOL') or "avbtool"

    part_size = OPTIONS.info_dict.get("boot_size", None)

    part_size = info_dict.get("boot_size", None)

    cmd = [avbtool, "add_hash_footer", "--image", img.name,

           "--partition_size", str(part_size), "--partition_name", "boot"]

    AppendAVBSigningArgs(cmd)

    args = OPTIONS.info_dict.get("board_avb_boot_add_hash_footer_args", None)

    args = info_dict.get("board_avb_boot_add_hash_footer_args", None)

    if args and args.strip():

      cmd.extend(shlex.split(args))

    p = Run(cmd, stdout=subprocess.PIPE)