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

Commit 5ec1a7a6 authored by Tianjie's avatar Tianjie
Browse files

Rename the boot image for avb validation 

Starting from http://go/aog/1328118, we chained the 1st GKI
boot image into vbmeta. However, this fails avb validation;
because the avbtool constructs the image path based by using
"partition name + ext".

This cl works around the issue by renaming boot-5.4.img to
boot.img, so avbtool can find the image correctly.

Bug: 159656873
Test: run validate target file
Change-Id: I577226596e139e5b5f3e6ca3c28ced02431ca392
parent 0c263fd2

tools/releasetools/validate_target_files.py

+11 −0
Original line number Diff line number Diff line
@@ -371,6 +371,17 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options): 
            partition, info_dict, key_file)

        cmd.extend(['--expected_chain_partition', chained_partition_arg])



    # Handle the boot image with a non-default name, e.g. boot-5.4.img

    boot_images = info_dict.get("boot_images")

    if boot_images:

      # we used the 1st boot image to generate the vbmeta. Rename the filename

      # to boot.img so that avbtool can find it correctly.

      first_image_name = boot_images.split()[0]

      first_image_path = os.path.join(input_tmp, 'IMAGES', first_image_name)

      assert os.path.isfile(first_image_path)

      renamed_boot_image_path = os.path.join(input_tmp, 'IMAGES', 'boot.img')

      os.rename(first_image_path, renamed_boot_image_path)



    proc = common.Run(cmd)

    stdoutdata, _ = proc.communicate()

    assert proc.returncode == 0, \