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

Commit 38888d39 authored by Daniel Norman's avatar Daniel Norman
Browse files

Turns on building vbmeta.img when merging if avb_enable=true. 

Needed after commit 82182257
which skips regenerating vbmeta.img if avb_building_vbmeta_image!=true.
Partial builds that disable vbmeta generation do not set this field.

Bug: 169892879
Test: Run merge_target_files.py on builds that have avb_enable=true but
      PRODUCT_BUILD_VBMETA_IMAGE=false. Observe vbmeta.img generation.
Change-Id: Id498dbd28c909e19cd35178b95a0b5dc22a1ac70
parent ad33b891

tools/releasetools/merge_target_files.py

+6 −0
Original line number Diff line number Diff line
@@ -456,6 +456,12 @@ def process_misc_info_txt(framework_target_files_temp_dir, 
    # false in the partial builds to prevent duplicate building of super.img.

    merged_dict['build_super_partition'] = 'true'



  # If AVB is enabled then ensure that we build vbmeta.img.

  # Partial builds with AVB enabled may set PRODUCT_BUILD_VBMETA_IMAGE=false to

  # skip building an incomplete vbmeta.img.

  if merged_dict.get('avb_enable') == 'true':

    merged_dict['avb_building_vbmeta_image'] = 'true'



  # Replace <image>_selinux_fc values with framework or vendor file_contexts.bin

  # depending on which dictionary the key came from.

  # Only the file basename is required because all selinux_fc properties are