gs101: use prebuilt GKI boot.img for production builds

Use:
* boot-user.img for -user builds
* boot.img for -userdebug and -eng builds

Bug: 188095549
Test: make dist (oriole-user)
Test: make dist (oriole-userdebug)
Change-Id: Ic4df227f2b4c261297272f17e6645b7ce1f5d4f3
This commit is contained in:
Petri Gynther 2021-07-20 22:58:00 -07:00
parent f5ec0f6726
commit 645bea6054

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
ifeq (,$(TARGET_PREBUILT_KERNEL))
TARGET_NO_KERNEL := true
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot.img
else
BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot-user.img
endif
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