commit a25382e5658734a3c6e0132e882837dc0dc2a36c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 15 02:48:43 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 15 02:48:43 2020 +0000
tree 7d53ea7ac952368615db9d0a2254cb5ec8ad01ca
parent 78ee01250957c3597373afdf0ce2d7705690b3a1
parent 6af48c831254b0f4e5df42d8669519abb6aaf511

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

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 32f9edd..2608869 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -787,9 +787,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.