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

Commit ec702cae authored by Seungjae Yoo's avatar Seungjae Yoo Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Id7b5414cb9dc0a8d80dde76354b60b5dcf13ce62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 722836c1 5d034ba5

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