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

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

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

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

Change-Id: I33f2199fb8fa79135ea9778e055ec338711e97e7
parents ec8881bd c92ebe14

core/Makefile

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