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

Commit 7137d87e authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7233012 from d9d84c90 to sc-v2-release 

Change-Id: If95b81d5afa6a83d0fa58f0a8c8653b1e36b750d
parents cbb492a5 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/fastboot.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1391,6 +1391,7 @@ static void CancelSnapshotIfNeeded() { 


class ImageSource {

  public:

    virtual ~ImageSource() {};

    virtual bool ReadFile(const std::string& name, std::vector<char>* out) const = 0;

    virtual unique_fd OpenFile(const std::string& name) const = 0;

};

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 {};