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

Commit 1de28aae 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: b6840067 am: e53227a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8711f8a35ae14e59d471b11732b080a11b542202
parents 15d6b176 e53227a1
Loading
Loading
Loading
Loading
+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 $@