commit 62e20f0d218f60bae563b4ee742d88cca1fc1901
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jan 16 11:12:54 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 16 11:12:54 2025 -0800
tree e463459a22a4ea1692c6b6e3a45e7c52041dd9ba
parent 9b5f996030a4290e4a52cddf3ba398ec0e5c564f
parent d44e13b41ae5f600e1279f2c5b60344c4f8c7088

Merge "Truncate vbmeta to 64KB" into main

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index eccce89..5d82c21 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5034,6 +5034,10 @@
 	    $(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 @@
     $(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