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

Commit e29f6465 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Truncate vbmeta to 64KB" into main am: 62e20f0d am: 067572dc 

Original change: https://android-review.googlesource.com/c/platform/build/+/3453281



Change-Id: I55281bb9faacd8af7f5d8d951090a2b44a88b025
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba1b056d 067572dc

core/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -5034,6 +5034,10 @@ define build-chained-vbmeta-image 
	    $(foreach image,$(BOARD_AVB_$(call to-upper,$(1))), \

	        --include_descriptors_from_image $(call images-for-partitions,$(image))) \

	    --output $@

      # libavb expects to be able to read the maximum vbmeta size, so we must provide a partition

      # which matches this or the read will fail.

      # See external/avb/libavb/avb_slot_verify.c#VBMETA_MAX_SIZE

      truncate -s 65536 $@

endef



ifdef BUILDING_SYSTEM_IMAGE
@@ -5092,6 +5096,10 @@ define build-vbmetaimage-target 
    $(PRIVATE_AVB_VBMETA_SIGNING_ARGS) \

    $(BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS) \

    --output $@

    # libavb expects to be able to read the maximum vbmeta size, so we must provide a partition

    # which matches this or the read will fail.

    # See external/avb/libavb/avb_slot_verify.c#VBMETA_MAX_SIZE

    truncate -s 65536 $@

  $(hide) rm -rf $(AVB_CHAIN_KEY_DIR)

endef