commit b6840067c48cb1f5b87650506a1efc0cf01df5a7
author Devin Moore <devinmoore@google.com> Wed Mar 10 22:42:12 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 10 22:42:12 2021 +0000
tree ca0cf08cc5a3562d6964aacd231cf26a283776f3
parent 40ea7379a8c90b7fb1cf37421a81234856699ef8
parent 2e43e34d535ad9030885be9f5942d0c29f569c2e

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index a67d02a..38ce2fa 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1022,6 +1022,11 @@
 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 $@