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

Commit d97f8505 authored by Daniel Zheng's avatar Daniel Zheng Committed by Gerrit Code Review
Browse files

Merge "Removing --apply-vbmeta for vbmeta_system"

parents f1cd83be 94562288

core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -5414,7 +5414,7 @@ ifeq ($(BUILDING_VBMETA_IMAGE),true) 
	$(hide) echo "flash --apply-vbmeta vbmeta" >> $@

endif

ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))

	$(hide) echo "flash --apply-vbmeta vbmeta_system" >> $@

	$(hide) echo "flash vbmeta_system" >> $@

endif

ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))

	$(hide) echo "flash --apply-vbmeta vbmeta_vendor" >> $@
@@ -5424,7 +5424,7 @@ ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),) 
endif

ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)))

	$(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \

	  echo "flash --apply-vbmeta vbmeta_$(partition)" >> $@;)

	  echo "flash vbmeta_$(partition)" >> $@;)

endif

endif # BOARD_AVB_ENABLE

	$(hide) echo "reboot fastboot" >> $@