commit 091b1e141b62baffe0bec537554f1a4c20ba51d9
author Chris Fries <cfries@google.com> Wed Jul 14 15:23:13 2021 +0000
committer TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 14 16:22:17 2021 +0000
tree acc4969e68348f049cbfa4311ce48f0eaf940c9e
parent 30393266aa0138d0e43f766bae28abfff370ed15

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

This reverts commit 63ba0cb1affa83446f10585d403c81cc618be71a.

Reason for revert: Tentatively trying to address, http://b/193588301 OTA full package does not exist in O6/R4_SD1A.210714.001 userdebug build [SD1A]

Bug: 193588301
Change-Id: I9d5d9fc132bc7eaf7c0adccee7a18558d80edb40

BoardConfig-common.mk

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index cff6ed2..ba119b9 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -53,13 +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
-BOARD_PREBUILT_BOOTIMAGE := $(TARGET_KERNEL_DIR)/boot.img
-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