PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "otautil: Fix mac build."

Browse Source
This commit is contained in:
Tao Bao
2017-10-10 18:34:53 +00:00
committed by Gerrit Code Review
parent abade5af15 c13d2ec772
commit eb8a064066
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
otautil/Android.bp
View File

@@ -29,6 +29,7 @@ cc_library_static {
], ],
cflags: [ cflags: [
"-D_FILE_OFFSET_BITS=64",
"-Werror", "-Werror",
"-Wall", "-Wall",
], ],

6
otautil/SysUtil.cpp
View File

@@ -100,7 +100,7 @@ bool MemMapping::MapBlockFile(const std::string& filename) {
} }
// Reserve enough contiguous address space for the whole file. // 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) { if (reserve == MAP_FAILED) {
PLOG(ERROR) << "failed to reserve address space"; PLOG(ERROR) << "failed to reserve address space";
return false; return false;
@@ -135,8 +135,8 @@ bool MemMapping::MapBlockFile(const std::string& filename) {
break; break;
} }
void* range_start = mmap64(next, range_size, PROT_READ, MAP_PRIVATE | MAP_FIXED, fd, void* range_start = mmap(next, range_size, PROT_READ, MAP_PRIVATE | MAP_FIXED, fd,
static_cast<off64_t>(start) * blksize); static_cast<off_t>(start) * blksize);
if (range_start == MAP_FAILED) { if (range_start == MAP_FAILED) {
PLOG(ERROR) << "failed to map range " << i << ": " << line; PLOG(ERROR) << "failed to map range " << i << ": " << line;
success = false; success = false;