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

Commit eb8a0640 authored by Tao Bao's avatar Tao Bao Committed by Gerrit Code Review
Browse files

Merge "otautil: Fix mac build."

parents abade5af c13d2ec7

otautil/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cc_library_static { 
    ],



    cflags: [

        "-D_FILE_OFFSET_BITS=64",

        "-Werror",

        "-Wall",

    ],

otautil/SysUtil.cpp

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ bool MemMapping::MapBlockFile(const std::string& filename) { 
  }



  // Reserve enough contiguous address space for the whole file.

  void* reserve = mmap64(nullptr, blocks * blksize, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);

  void* reserve = mmap(nullptr, blocks * blksize, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);

  if (reserve == MAP_FAILED) {

    PLOG(ERROR) << "failed to reserve address space";

    return false;
@@ -135,8 +135,8 @@ bool MemMapping::MapBlockFile(const std::string& filename) { 
      break;

    }



    void* range_start = mmap64(next, range_size, PROT_READ, MAP_PRIVATE | MAP_FIXED, fd,

                               static_cast<off64_t>(start) * blksize);

    void* range_start = mmap(next, range_size, PROT_READ, MAP_PRIVATE | MAP_FIXED, fd,

                             static_cast<off_t>(start) * blksize);

    if (range_start == MAP_FAILED) {

      PLOG(ERROR) << "failed to map range " << i << ": " << line;

      success = false;