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

Commit cfa62e36 authored by Daniel Zheng's avatar Daniel Zheng Committed by Automerger Merge Worker
Browse files

Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559 am: 2ad23ca5 

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



Change-Id: I0c900faed64028540fede0b2c1f963ab9ca88ecf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29271142 2ad23ca5

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -5383,6 +5383,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" >> $@
@@ -5393,9 +5396,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)" >> $@;)