From 96a90bd47a62b03eeed1cedadee24cf029fe32ab Mon Sep 17 00:00:00 2001
From: Petri Gynther <pgynther@google.com>
Date: Fri, 1 Oct 2021 02:26:57 +0000
Subject: [PATCH] Revert^2 "gs101: re-enable prebuilt boot.img/boot-user.img
 usage"

This reverts commit 48a5fe4304e3c5720f468d6b9147ca36bbe9eb4e.

Reason for revert:
Re-enable gs101 prebuilt boot image usage.
All necessary prerequisites have been merged:
cl/399995993, ag/15953678, ag/15953343, ag/15953037, ag/15953719

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

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 636a46d6..ae34f85e 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