summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Peng <robinpeng@google.com>2022-11-04 06:48:30 +0000
committerRobin Peng <robinpeng@google.com>2022-11-04 06:48:30 +0000
commit31e17d29ad1f1e437c6f8421af40e6696d7decb7 (patch)
tree592bf387dfc1e20593f8864baf04e53069067586
parentc0825f2717933a1e33e51c4e3ca4cf413402ffef (diff)
downloadgs101-31e17d29ad1f1e437c6f8421af40e6696d7decb7.tar.gz
gs101: 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: Icbd880c9461d7ba3d707d56c7ff43f4b8bf2e47c
-rw-r--r--BoardConfig-common.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index d691a992..cb8072d7 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -51,11 +51,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