StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505ae

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620094

Change-Id: Iba958ede3dc516a08c9a532ef37f566220e870b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2023-06-12 16:39:29 +00:00
committed by Automerger Merge Worker
parent d57d4fed31 d97f8505ae
commit a5b20d6ef1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
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" >> $@