commit 6af48c831254b0f4e5df42d8669519abb6aaf511
author Daniel Norman <danielnorman@google.com> Mon Dec 14 11:25:22 2020 -0800
committer Daniel Norman <danielnorman@google.com> Mon Dec 14 13:43:13 2020 -0800
tree 67f50ab13075f7721e4854a1d37308506021709e
parent 999779bdcec6d72461f8c7b313888c554c104500

Allows GSI AVB keys on vendor boot even when not building vendor boot.

This allows system-only builds (which disable vendor images) to inherit
from device makefiles that normally place GSI AVB keys on vendor boot.

Bug: 175594737
Test: lunch system-only build, m, observe warning not failure
Change-Id: Ib6c199d0a47b3b3be2143241d83ab586966cfd1e

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 1a80348..7ee1de4 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -777,9 +777,6 @@
   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.