commit c92ebe14f2687587e868f329f393df61e5cea697
author Devin Moore <devinmoore@google.com> Mon Jun 21 18:22:31 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 21 18:22:31 2021 +0000
tree 45cd626a04c382e46fc572ed1e06baffc8f89cad
parent 186c7779f12dd7b4619cf51d99e859c77d4a587d
parent 5fe993f0cff23c5e25a51b5410710ad08eecbc6f

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

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 0ca61bc..1a60157 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1122,11 +1122,6 @@
 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 $@