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

Merge "fix m fastboot_info" am: 1f09d54104 am: 5cfa89b404

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

Change-Id: I1c51ce797148cfc68f160c6f19dcb62b70cc7604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng
2023-05-08 19:47:08 +00:00
committed by Automerger Merge Worker
parent 8830d1f018 5cfa89b404
commit 4bea5638a8
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

@@ -5315,13 +5315,13 @@ ifneq ($(INSTALLED_VENDOR_BOOTIMAGE_TARGET),)
$(hide) echo "flash vendor_boot" >> $@ $(hide) echo "flash vendor_boot" >> $@
endif 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), \
$(hide) echo "flash --apply-vbmeta vbmeta_$(partition)" >> $@;) echo "flash --apply-vbmeta vbmeta_$(partition)" >> $@;)
endif endif
endif # BOARD_AVB_ENABLE endif # BOARD_AVB_ENABLE
$(hide) echo "reboot fastboot" >> $@ $(hide) echo "reboot fastboot" >> $@
$(hide) echo "update-super" >> $@ $(hide) echo "update-super" >> $@
$(foreach partition,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \ $(hide) $(foreach partition,$(BOARD_SUPER_PARTITION_PARTITION_LIST), \
echo "flash $(partition)" >> $@;) echo "flash $(partition)" >> $@;)
ifdef BUILDING_SYSTEM_OTHER_IMAGE ifdef BUILDING_SYSTEM_OTHER_IMAGE
$(hide) echo "flash --slot-other system system_other.img" >> $@ $(hide) echo "flash --slot-other system system_other.img" >> $@