Merge "Throw an error if androidboot.hardware is used for bootconfig" am: b6840067c4

Original change: https://android-review.googlesource.com/c/platform/build/+/1624569

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21280f0c71c4aeb116d31ea612b8175454ff6e63
This commit is contained in:
Devin Moore
2021-03-11 01:41:25 +00:00
committed by Automerger Merge Worker

View File

@@ -1022,6 +1022,11 @@ ifdef INTERNAL_KERNEL_CMDLINE
endif
ifdef INTERNAL_BOOTCONFIG
ifneq (,$(findstring androidboot.hardware=, $(INTERNAL_BOOTCONFIG)))
$(error "androidboot.hardware" BOOTCONFIG parameter is not supported due to \
bootconfig limitations. Use "hardware" instead. INTERNAL_BOOTCONFIG: \
$(INTERNAL_BOOTCONFIG))
endif
INTERNAL_VENDOR_BOOTCONFIG_TARGET := $(PRODUCT_OUT)/vendor-bootconfig.img
$(INTERNAL_VENDOR_BOOTCONFIG_TARGET):
rm -f $@