From 7eec55ab4e8d62074f8465138770a33283e703bc Mon Sep 17 00:00:00 2001
From: Petri Gynther <pgynther@google.com>
Date: Thu, 1 Jul 2021 15:40:00 -0700
Subject: [PATCH] gs101: use prebuilt GKI boot.img for production builds

Use prebuilt GKI boot.img for production builds.
Debug builds continue to use their own Image.lz4.

Bug: 191764119
Change-Id: I2b4950ce334cc990e858e0ea410ad7e57d6decf6
---
 BoardConfig-common.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ba119b9c..cff6ed27 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -53,8 +53,13 @@ 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
+BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot.img
+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