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

Commit f9c4bd3f authored by Daniel Zheng's avatar Daniel Zheng
Browse files

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
parent e86aa7b9

core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -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)" >> $@;)