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

Merge "Moving vendor_boot out of BOARD_AVB_ENABLE block" into main am: 0ee11559f9

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

Change-Id: Icaf55a978175f82f98684ee929a2153e9cc8e13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2023-07-19 16:39:24 +00:00
committed by Automerger Merge Worker
parent a3ecbf45ff 0ee11559f9
commit 2ad23ca508
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/Makefile
View File

@@ -5383,6 +5383,9 @@ endif
ifeq ($(BOARD_USES_PVMFWIMAGE),true) ifeq ($(BOARD_USES_PVMFWIMAGE),true)
$(hide) echo "flash pvmfw" >> $@ $(hide) echo "flash pvmfw" >> $@
endif endif
ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
$(hide) echo "flash vendor_boot" >> $@
endif
ifeq ($(BOARD_AVB_ENABLE),true) ifeq ($(BOARD_AVB_ENABLE),true)
ifeq ($(BUILDING_VBMETA_IMAGE),true) ifeq ($(BUILDING_VBMETA_IMAGE),true)
$(hide) echo "flash --apply-vbmeta vbmeta" >> $@ $(hide) echo "flash --apply-vbmeta vbmeta" >> $@
@@ -5393,9 +5396,6 @@ endif
ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR))) ifneq (,$(strip $(BOARD_AVB_VBMETA_VENDOR)))
$(hide) echo "flash --apply-vbmeta vbmeta_vendor" >> $@ $(hide) echo "flash --apply-vbmeta vbmeta_vendor" >> $@
endif endif
ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
$(hide) echo "flash vendor_boot" >> $@
endif
ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS))) ifneq (,$(strip $(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS)))
$(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \ $(hide) $(foreach partition,$(BOARD_AVB_VBMETA_CUSTOM_PARTITIONS), \
echo "flash vbmeta_$(partition)" >> $@;) echo "flash vbmeta_$(partition)" >> $@;)