Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25da4b30 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I13ca5b497bb3e03d055d74b9bb465bf072b1ad6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b9f6a0b d5d01db8

fastboot/fastboot.cpp

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

    sparse_file** s;





    if (partition == "boot" || partition == "boot_a" || partition == "boot_b" ||

    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);

        copy_avb_footer(partition, buf);

    }

    }