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

Commit fc65231a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support PRODUCT_BUILD_VBMETA_IMAGE for target files"

parents d46afc27 82182257

core/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -4144,6 +4144,9 @@ ifdef BOARD_USES_VENDORIMAGE 
	$(hide) echo "board_uses_vendorimage=true" >> $@

endif

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_vbmeta_key_path=$(BOARD_AVB_KEY_PATH)" >> $@

	$(hide) echo "avb_vbmeta_algorithm=$(BOARD_AVB_ALGORITHM)" >> $@

tools/releasetools/add_img_to_target_files.py

+3 −2
Original line number Diff line number Diff line
@@ -959,6 +959,7 @@ def AddImagesToTargetFiles(filename): 
          if item not in vbmeta_vendor.split()]

      vbmeta_partitions.append("vbmeta_vendor")



    if OPTIONS.info_dict.get("avb_building_vbmeta_image") == "true":

      banner("vbmeta")

      AddVBMeta(output_zip, partitions, "vbmeta", vbmeta_partitions)