Merge "Allows GSI AVB keys on vendor boot even when not building vendor boot." am: a25382e565

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11f7210ad4f51a46e718a110b4457f121f14c9c0
This commit is contained in:
Treehugger Robot
2020-12-15 03:23:01 +00:00
committed by Automerger Merge Worker

View File

@@ -787,9 +787,6 @@ ifndef BUILDING_VENDOR_BOOT_IMAGE
ifeq (true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))
$(error Should not set BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT if not building vendor_boot image)
endif
ifeq (true,$(BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT))
$(error Should not set BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT if not building vendor_boot image)
endif
endif
# If BOARD_USES_GENERIC_KERNEL_IMAGE is set, BOARD_USES_RECOVERY_AS_BOOT must not be set.