From 0272b56e053e78def99aaee26a89407cbee54abb Mon Sep 17 00:00:00 2001
From: Robin Peng <robinpeng@google.com>
Date: Fri, 4 Nov 2022 06:49:05 +0000
Subject: gs201: remove prebuilt boot-user.img usage

When $(TARGET_KERNEL_DIR) contains:
* boot.img

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

Bug: 242812258
Change-Id: I10ccfaacfc77cc37eee085b27575fae515ceb088
---
 BoardConfig-common.mk | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'BoardConfig-common.mk')

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 20ce92c..bb2910a 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -58,11 +58,7 @@ BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
 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
-- 
cgit v1.2.3