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

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

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

Merge "Throw an error if androidboot.hardware is used for bootconfig" am: b6840067 am: e53227a1 am: 1de28aae

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97d02e9426b9e547029c265caad8bc7e2ef09b57
parents 20ddb0d8 1de28aae

core/Makefile

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