Merge "remove --apply-vbmeta from vbmeta_vendor" into main am: 2860f5f574

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

Change-Id: I600baab15b26c6215c4550fb5711019ab7121d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2023-09-13 07:58:34 +00:00
committed by Automerger Merge Worker

View File

@@ -5632,7 +5632,7 @@ ifneq (,$(strip $(BOARD_AVB_VBMETA_SYSTEM)))
$(hide) echo "flash vbmeta_system" >> $@
endif
ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))
$(hide) echo "flash --apply-vbmeta vbmeta_vendor" >> $@
$(hide) echo "flash vbmeta_vendor" >> $@
endif
ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)))
$(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \