commit ccbd2c743174386535883bc5de2a03aec9e3f951
author Petri Gynther <pgynther@google.com> Thu Aug 19 13:10:07 2021 -0700
committer Petri Gynther <pgynther@google.com> Mon Aug 23 19:20:43 2021 +0000
tree 2bb2a9de60c0858c29fd9645c6b051e01673e076
parent 95f4b9ccb7c31d7c76e42e57e37a4a4b3fea592a

Revert "gs101: use prebuilt GKI boot.img for production builds"

This reverts commit 96007d8f9cab5f6028cb4a1b15e30c6ffe8bf5dd.

Temporarily revert prebuilt boot.img usage on sc-qpr1-dev
until we have official signed GKI boot images available.

Bug: 188095549
Bug: 191417025
Change-Id: I2f9907d3674f8a8869aac3c926994e116c76a91b

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 4689c68..b21f539 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -53,17 +53,8 @@
 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