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

Commit e68d9221 authored by Seungjae Yoo's avatar Seungjae Yoo
Browse files

Append pubkey of microdroid-vendor into avb prop of vendor_boot 

For protected VM in AVF, the public key of microdroid-vendor partition
should be passed via trustable way. However, pvmfw config data is
constructed from ABL. AVB property is needed to pass the public key from
the source code into ABL, determined in the build time.

Bug: 285854379
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor_boot.img
Change-Id: I024d1d835cccb27feef1164aca30712dbb8a70da
parent 2f9162f1

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -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