commit 087fef5fd8836678291bdffef3ce26d68178c236
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 23 02:17:54 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 23 02:17:54 2021 +0000
tree 2ff9542c98b866760c806c6610170b4b4953073a
parent 0b6dd94b9833d1bed9f1c28a04f97c51fdb5ed5e
parent 0c94c3ec6cdcd62683436ffff016d9bfa114179b

Snap for 7483611 from 0c94c3ec6cdcd62683436ffff016d9bfa114179b to mainline-adbd-release

Change-Id: I8e16334ff0b2bdecf841cb4632ad1b131f135fae

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 3b14386..28edc87 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 $@