p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Needed after commit 8218225794
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
This commit is contained in:
Daniel Norman 2020-11-19 14:51:15 -08:00
parent ad33b891f8
commit 38888d390f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/merge_target_files.py
View File

@ -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. # false in the partial builds to prevent duplicate building of super.img.
merged_dict['build_super_partition'] = 'true' 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 # Replace <image>_selinux_fc values with framework or vendor file_contexts.bin
# depending on which dictionary the key came from. # depending on which dictionary the key came from.
# Only the file basename is required because all selinux_fc properties are # Only the file basename is required because all selinux_fc properties are