From 645bea6054eda76b95259e6722bac9c8ed49634b Mon Sep 17 00:00:00 2001
From: Petri Gynther <pgynther@google.com>
Date: Tue, 20 Jul 2021 22:58:00 -0700
Subject: [PATCH] gs101: use prebuilt GKI boot.img for production builds

Use:
* boot-user.img for -user builds
* boot.img for -userdebug and -eng builds

Bug: 188095549
Test: make dist (oriole-user)
Test: make dist (oriole-userdebug)
Change-Id: Ic4df227f2b4c261297272f17e6645b7ce1f5d4f3
---
 BoardConfig-common.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ba119b9c..de1b989c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -53,8 +53,17 @@ BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
-TARGET_NO_KERNEL := false
 TARGET_NO_RADIOIMAGE := true
+ifeq (,$(TARGET_PREBUILT_KERNEL))
+TARGET_NO_KERNEL := true
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot.img
+else
+BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot-user.img
+endif
+else
+TARGET_NO_KERNEL := false
+endif
 BOARD_USES_GENERIC_KERNEL_IMAGE := true
 BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
 BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true