Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0

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

Change-Id: I41efbe70ab0813bcfc8c690e8a7c30a85d7f307d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Seungjae Yoo
2023-12-05 05:29:05 +00:00
committed by Automerger Merge Worker

View File

@@ -4600,6 +4600,12 @@ BOARD_AVB_PVMFW_ADD_HASH_FOOTER_ARGS += \
--prop com.android.build.pvmfw.security_patch:$(PVMFW_SECURITY_PATCH)
endif
# Append avbpubkey of microdroid-vendor partition into vendor_boot partition.
ifdef MICRODROID_VENDOR_AVBKEY
BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS += \
--prop_from_file com.android.build.microdroid-vendor.avbpubkey:$(MICRODROID_VENDOR_AVBKEY)
endif
BOOT_FOOTER_ARGS := BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS
INIT_BOOT_FOOTER_ARGS := BOARD_AVB_INIT_BOOT_ADD_HASH_FOOTER_ARGS
VENDOR_BOOT_FOOTER_ARGS := BOARD_AVB_VENDOR_BOOT_ADD_HASH_FOOTER_ARGS