Commit 8c45d05d authored Jan 13, 2023 by Treehugger Robot Committed by Automerger Merge Worker Jan 13, 2023

Merge "fastboot: Copy AVB footer from recovery.img to the end of the...

Merge "fastboot: Copy AVB footer from recovery.img to the end of the partition" am: d5d01db8 am: 25da4b30

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385299

Change-Id: Ib563a684286ac5a66484abcfd61fe43ef563d529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fastboot/fastboot.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -1082,7 +1082,8 @@ static void flash_buf(const std::string& partition, struct fastboot_buffer* buf)
		sparse_file** s;

		if (partition == "boot" \|\| partition == "boot_a" \|\| partition == "boot_b" \|\|
		partition == "init_boot" \|\| partition == "init_boot_a" \|\| partition == "init_boot_b") {
		partition == "init_boot" \|\| partition == "init_boot_a" \|\| partition == "init_boot_b" \|\|
		partition == "recovery" \|\| partition == "recovery_a" \|\| partition == "recovery_b") {
		copy_avb_footer(partition, buf);
		}