commit 3363a0b8d66e52f1e8eacd983f661ac385a72e1a
author Steve Muckle <smuckle@google.com> Wed Feb 12 13:38:28 2020 -0800
committer Steve Muckle <smuckle@google.com> Wed Mar 04 10:54:56 2020 -0800
tree 81bfdb79104ed0b927bab12dfb50bf6a28706258
parent 6bf4a7d0be45b720dae92249aab72c58247e3e72

initial GKI boot.img support

The GKI boot.img should be generated alongside the GSI. To make this
possible, define a flag (TARGET_NO_VENDOR_BOOT) that can be used to
disable the generation of the vendor_boot image.

Bug: 138323550
Change-Id: I91181853b26815e68a2fa2216b68579780d034dc

core/board_config.mk

diff --git a/core/board_config.mk b/core/board_config.mk
index 5d658dc..4efe10a 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -361,7 +361,9 @@
 BUILDING_VENDOR_BOOT_IMAGE :=
 ifdef BOARD_BOOT_HEADER_VERSION
   ifneq ($(call math_gt_or_eq,$(BOARD_BOOT_HEADER_VERSION),3),)
-    BUILDING_VENDOR_BOOT_IMAGE := true
+    ifneq ($(TARGET_NO_VENDOR_BOOT),true)
+      BUILDING_VENDOR_BOOT_IMAGE := true
+    endif
     ifdef BUILDING_RECOVERY_IMAGE
       ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
         $(error Boot header version >=3 requires recovery as boot)