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

2021-03-10 22:42:12 +00:00 · 2021-03-10 22:42:12 +00:00 · b6840067c4
parent 40ea7379a8 2e43e34d53
commit b6840067c4
1 changed files with 5 additions and 0 deletions
--- a/core/Makefile
+++ b/core/Makefile
@ -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 $@