commit cc6c202caa6b461d0c2e3f7d47ec73d76424ec48
author Yifan Hong <elsk@google.com> Fri Nov 13 19:12:06 2020 -0800
committer Yifan Hong <elsk@google.com> Fri Nov 13 19:12:19 2020 -0800
tree f848cfd3101decc949a4ba4035551c7fff25e850
parent 4cecc437962f947584d298db16df2392b88c2890

Recovery resource must be install to either boot or vendor_boot

... but not both.

Test: builds
Change-Id: I4bebb09632f49fddef25eadc2cad89f41f38178b

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 457b3bf..fafd7b2 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -787,3 +787,10 @@
       Use BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT instead)
   endif
 endif
+
+ifeq (true,$(BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT))
+  ifeq (true,$(BOARD_USES_RECOVERY_AS_BOOT))
+    $(error BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT and BOARD_USES_RECOVERY_AS_BOOT cannot be \
+      both true. Recovery resources should be installed to either boot or vendor_boot, but not both)
+  endif
+endif