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

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

Browse source 
This reverts commit 7badc4b5f1c7b6adff8cd9142f5c97bd4a5a0d49.

Reason for revert: it introduce b/201469630 and b/201476061

Bug: 201469630
Bug: 201476061
Change-Id: Id48ea931410a55bfd382feb7a0da02994fdf8928
(cherry picked from commit 48a5fe4304e3c5720f468d6b9147ca36bbe9eb4e)
This commit is contained in:
Jason Chiu 2021-09-29 07:17:17 +00:00 • committed by Android Build Coastguard Worker
parent 131f731e22
commit 7ea485bd00
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
BoardConfig-common.mk
View file

@ -53,17 +53,8 @@ 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_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 TARGET_NO_KERNEL := false
endif TARGET_NO_RADIOIMAGE := true
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