commit 5d034ba5c0f984086d85b50cabbd76302e01e363
author Seungjae Yoo <seungjaeyoo@google.com> Tue Dec 05 04:49:57 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 05 04:49:57 2023 +0000
tree 47b5e8dea6f06685a795ff829e6412dbcd38f020
parent e4922b87964245267f6acac46c6a407f31b33be5
parent e68d922118ba89a3760c4a15f80fdbaf71a3584b

Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 845f7c8..68e968e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4600,6 +4600,12 @@
     --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