summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-10 20:53:27 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-10-10 20:53:27 +0200
commit814f05d8532e95523107235245f373e2d8f42b18 (patch)
tree9e651faeca96ac15b706ff20058d5481ec2e7730
parentMerge changes from topic "libedify-header" am: abade5af15 (diff)
parentMerge "otautil: Fix mac build." (diff)
downloadandroid_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.tar
android_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.tar.gz
android_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.tar.bz2
android_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.tar.lz
android_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.tar.xz
android_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.tar.zst
android_bootable_recovery-814f05d8532e95523107235245f373e2d8f42b18.zip
-rw-r--r--otautil/Android.bp1
-rw-r--r--otautil/SysUtil.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/otautil/Android.bp b/otautil/Android.bp
index 5905ba649..659fefada 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -29,6 +29,7 @@ cc_library_static {
],
cflags: [
+ "-D_FILE_OFFSET_BITS=64",
"-Werror",
"-Wall",
],
diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp
index d54a824d2..0655c4778 100644
--- a/otautil/SysUtil.cpp
+++ b/otautil/SysUtil.cpp
@@ -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;