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

Commit 0c94c3ec authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Revert "Throw an error if androidboot.hardware is used for bootconfig" am: 36b65955

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15054410

Change-Id: I4fff3e1d85a01c46bcbd397ea38465ef41094f3f
parents b68b9e0e 36b65955
Loading
Loading
Loading
Loading
+0 −5
Original line number Original line Diff line number Diff line
@@ -1117,11 +1117,6 @@ ifdef INTERNAL_KERNEL_CMDLINE
endif
endif


ifdef INTERNAL_BOOTCONFIG
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 := $(PRODUCT_OUT)/vendor-bootconfig.img
  $(INTERNAL_VENDOR_BOOTCONFIG_TARGET):
  $(INTERNAL_VENDOR_BOOTCONFIG_TARGET):
	rm -f $@
	rm -f $@