Merge "Removing --apply-vbmeta for vbmeta_system"

This commit is contained in:
Daniel Zheng 2023-06-12 15:42:16 +00:00 committed by Gerrit Code Review
commit d97f8505ae

View file

@ -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" >> $@