Revert "gs101: use prebuilt GKI boot.img for production builds" am: 314ca8bcf6 am: d55527e51e

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/15629452

Change-Id: I54b3144f613dc65c0c03088f6dd70bfaf22bcd0b
This commit is contained in:
Petri Gynther 2021-08-23 20:00:14 +00:00 committed by Automerger Merge Worker
commit c4ef2c3534

View file

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