From 50f56ac8c9ee358d152f3975495f3b33e7ed92cd Mon Sep 17 00:00:00 2001
From: Petri Gynther <pgynther@google.com>
Date: Mon, 27 Sep 2021 20:23:39 -0700
Subject: [PATCH] gs101: re-enable prebuilt boot.img/boot-user.img usage

When $(TARGET_KERNEL_DIR) contains:
* boot.img
* boot-user.img

then use those as prebuilt boot images for the target build.

Note that debug kernels (e.g. $(TARGET_KERNEL_DIR)/kasan) only have
Image.lz4, so the debug build ends up building boot.img from source.

Bug: 199997188
Change-Id: I6bb70644d8ab7356986f6ca6a77f3098d1ee0f83
---
 BoardConfig-common.mk | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 0d67432e..77b6245b 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
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)
+else
+BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot-user.img)
+endif
+ifneq (,$(BOARD_PREBUILT_BOOTIMAGE))
+TARGET_NO_KERNEL := true
+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