Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36b65955 authored by Devin Moore's avatar Devin Moore
Browse files

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

This reverts commit 2e43e34d.

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
Merged-In: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
parent 122a0073

core/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -1117,11 +1117,6 @@ 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 $@