Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gs101: re-enable prebuilt boot.img/boot-user.img usage

Browse source 
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
This commit is contained in:
Petri Gynther 2021-09-27 20:23:39 -07:00
parent 668587bc3d
commit 50f56ac8c9
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BoardConfig-common.mk
View file

@ -53,8 +53,17 @@ BOARD_KERNEL_CMDLINE += stack_depot_disable=off page_pinner=on
BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
TARGET_NO_BOOTLOADER := true TARGET_NO_BOOTLOADER := true
TARGET_NO_KERNEL := false
TARGET_NO_RADIOIMAGE := 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
TARGET_NO_KERNEL := false
endif
BOARD_USES_GENERIC_KERNEL_IMAGE := true BOARD_USES_GENERIC_KERNEL_IMAGE := true
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true