tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Append root digest information of microdroid vendor into vendor.img" into main am: a79329678d am: d53dd61fe9

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2877541

Change-Id: I6862637301ba9a81ad335dd7d85173fd3ea4ddd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Seungjae Yoo 2023-12-28 02:28:01 +00:00 committed by Automerger Merge Worker
commit b9f308c10b
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/Makefile
View file

@ -4600,10 +4600,18 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \
--prop com.android.build.pvmfw.security_patch:$(PVMFW_SECURITY_PATCH) --prop com.android.build.pvmfw.security_patch:$(PVMFW_SECURITY_PATCH)
endif endif
# Append avbpubkey of microdroid-vendor partition into vendor_boot partition. # Append root digest of microdroid-vendor partition's hashtree descriptor into vendor partition.
ifdef MICRODROID_VENDOR_AVBKEY ifdef MICRODROID_VENDOR_IMAGE_MODULE
BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS += \ MICRODROID_VENDOR_IMAGE := \
--prop_from_file com.android.build.microdroid-vendor.avbpubkey:$(MICRODROID_VENDOR_AVBKEY) $(call intermediates-dir-for,ETC,$(MICRODROID_VENDOR_IMAGE_MODULE))/$(MICRODROID_VENDOR_IMAGE_MODULE)
MICRODROID_VENDOR_ROOT_DIGEST := $(PRODUCT_OUT)/microdroid_vendor_root_digest
BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS += \
--prop_from_file com.android.build.microdroid-vendor.root_digest:$(MICRODROID_VENDOR_ROOT_DIGEST)
$(MICRODROID_VENDOR_ROOT_DIGEST): $(AVBTOOL) $(MICRODROID_VENDOR_IMAGE)
$(AVBTOOL) print_partition_digests \
--image $(MICRODROID_VENDOR_IMAGE) \
| tr -d '\n' | sed -E 's/.*: //g' > $@
$(INSTALLED_VENDORIMAGE_TARGET): $(MICRODROID_VENDOR_ROOT_DIGEST)
endif endif
BOOT_FOOTER_ARGS := BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS BOOT_FOOTER_ARGS := BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS