commit 0ee11559f94034b559d9d53f6c8da1467d9272fe
author Daniel Zheng <zhengdaniel@google.com> Wed Jul 19 15:57:45 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 19 15:57:45 2023 +0000
tree 5b1ba7a2c410ad0dd8ecd46c3c226097ed6906c0
parent 693afdca7450364f9edaab8ae5c5e20e8146a94c
parent f9c4bd3f3e1ea934712eac3fe36463b388681642

Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 29b2e08..3bd6ae1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -5383,6 +5383,9 @@
 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" >> $@
@@ -5393,9 +5396,6 @@
 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)" >> $@;)