StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support PRODUCT_BUILD_VBMETA_IMAGE for target files"

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-16 13:59:41 +00:00
committed by Gerrit Code Review
parent d46afc2714 8218225794
commit fc65231af1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Makefile
View File

@@ -4144,6 +4144,9 @@ ifdef BOARD_USES_VENDORIMAGE
$(hide) echo "board_uses_vendorimage=true" >> $@ $(hide) echo "board_uses_vendorimage=true" >> $@
endif endif
ifeq ($(BOARD_AVB_ENABLE),true) ifeq ($(BOARD_AVB_ENABLE),true)
ifeq ($(BUILDING_VBMETA_IMAGE),true)
$(hide) echo "avb_building_vbmeta_image=true" >> $@
endif # BUILDING_VBMETA_IMAGE
$(hide) echo "avb_enable=true" >> $@ $(hide) echo "avb_enable=true" >> $@
$(hide) echo "avb_vbmeta_key_path=$(BOARD_AVB_KEY_PATH)" >> $@ $(hide) echo "avb_vbmeta_key_path=$(BOARD_AVB_KEY_PATH)" >> $@
$(hide) echo "avb_vbmeta_algorithm=$(BOARD_AVB_ALGORITHM)" >> $@ $(hide) echo "avb_vbmeta_algorithm=$(BOARD_AVB_ALGORITHM)" >> $@

5
tools/releasetools/add_img_to_target_files.py
View File

@@ -959,8 +959,9 @@ def AddImagesToTargetFiles(filename):
if item not in vbmeta_vendor.split()] if item not in vbmeta_vendor.split()]
vbmeta_partitions.append("vbmeta_vendor") vbmeta_partitions.append("vbmeta_vendor")
banner("vbmeta") if OPTIONS.info_dict.get("avb_building_vbmeta_image") == "true":
AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions) banner("vbmeta")
AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions)
if OPTIONS.info_dict.get("use_dynamic_partitions") == "true": if OPTIONS.info_dict.get("use_dynamic_partitions") == "true":
banner("super_empty") banner("super_empty")