From f9c4bd3f3e1ea934712eac3fe36463b388681642 Mon Sep 17 00:00:00 2001 From: Daniel Zheng Date: Wed, 5 Jul 2023 12:20:57 -0700 Subject: [PATCH] Moving vendor_boot out of BOARD_AVB_ENABLE block vendor_boot is unrelated to this conditional. Moving it out so that this instruction will be added on devices which don't have this set Test: lunch db845c-userdebug, m fastboot_info Change-Id: I34ad24d4f32d727f0f82749ed13c3de08566e880 --- core/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Makefile b/core/Makefile index bf8b02b4f3..dda759684b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -5416,6 +5416,9 @@ endif ifeq ($(BOARD_USES_PVMFWIMAGE),true) $(hide) echo "flash pvmfw" >> $@ endif +ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),) + $(hide) echo "flash vendor_boot" >> $@ +endif ifeq ($(BOARD_AVB_ENABLE),true) ifeq ($(BUILDING_VBMETA_IMAGE),true) $(hide) echo "flash --apply-vbmeta vbmeta" >> $@ @@ -5426,9 +5429,6 @@ endif ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR))) $(hide) echo "flash --apply-vbmeta vbmeta_vendor" >> $@ endif -ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),) - $(hide) echo "flash vendor_boot" >> $@ -endif ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS))) $(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \ echo "flash vbmeta_$(partition)" >> $@;)