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

Commit 44914ee2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "fastboot driver: ftrucate64->ftruncate." am: 47229793 am: b9fcd33d... 

Merge "fastboot driver: ftrucate64->ftruncate." am: 47229793 am: b9fcd33d am: b8b57acf am: d9d84c90

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

Change-Id: I91bdd320ad31fe6f051421c7f6665e0b918ea9c5
parents 4fa70e00 d9d84c90

fastboot/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ cc_defaults { 
        "-Werror",

        "-Wunreachable-code",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-D_FILE_OFFSET_BITS=64"

    ],



    target: {

fastboot/vendor_boot_img_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ class DataUpdater { 
    if (!android::base::WriteStringToFd(data, fd)) {

        return ErrnoErrorf("Cannot write new content to {}", what);

    }

    if (TEMP_FAILURE_RETRY(ftruncate64(fd.get(), data.size())) == -1) {

    if (TEMP_FAILURE_RETRY(ftruncate(fd.get(), data.size())) == -1) {

        return ErrnoErrorf("Truncating new vendor boot image to 0x{:x} fails", data.size());

    }

    return {};