zuma: 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: I7e10698c179d061d16e8f5e4b391c4c82279005f
This commit is contained in:
Robin Peng 2022-11-04 06:49:46 +00:00
parent e15f63968a
commit 80841d9eb7

View file

@ -43,11 +43,7 @@ BOARD_BOOTCONFIG += androidboot.boot_devices=13200000.ufs
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
TARGET_NO_RADIOIMAGE := true TARGET_NO_RADIOIMAGE := true
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) 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)) ifneq (,$(BOARD_PREBUILT_BOOTIMAGE))
TARGET_NO_KERNEL := true TARGET_NO_KERNEL := true
else else