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 
am: eb8a064066

Change-Id: Ia757cdeb858e2d60fab17ecbf74eb6d39e650549
This commit is contained in:
Tao Bao
2017-10-10 18:45:55 +00:00
committed by android-build-merger
parent 28e8a2c43a eb8a064066
commit bc131ef1bd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
otautil/Android.bp
+1
View File
@@ -29,6 +29,7 @@ cc_library_static {
], ],
cflags: [ cflags: [
"-D_FILE_OFFSET_BITS=64",
"-Werror", "-Werror",
"-Wall", "-Wall",
], ],
otautil/SysUtil.cpp
+3 -3
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;