commit 5fe993f0cff23c5e25a51b5410710ad08eecbc6f
author Devin Moore <devinmoore@google.com> Fri Jun 18 08:22:50 2021 -0700
committer Devin Moore <devinmoore@google.com> Fri Jun 18 13:42:48 2021 -0700
tree 2e7b067b7dd238382208fd4c82c2f26b6edb1cc9
parent 97b0ada6312f269b30ba411901531566ba84b153

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

This reverts commit 2e43e34d535ad9030885be9f5942d0c29f569c2e.

The kernel bootconfig feature has been updated to handle mixed subkeys
and values, so androidboot.hardware is ok to use now.

Test: build and boot cuttlefish with 'hardware=cutf_vm'
Test: build and boot cuttlefish with 'androidboot.hardware=cutf_vm'
Bug: 191502832
Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index c42e1dd..073f6ce 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1117,11 +1117,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 $@