commit 6d5da419715a852e29dde9f25858dc3802819dea
author Tao Bao <tbao@google.com> Tue Oct 10 19:15:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 10 19:15:43 2017 +0000
tree d97136775dafcbe882db7caeca6aa5f7f2e86a6b
parent f859b684a6db7d99c752008555dc4f98cb5497df
parent 13752ae25c0f9fb51f6628a8b6e83cb33e5f487a

Merge "otautil: Fix mac build." am: eb8a064066 am: bc131ef1bd am: 814f05d853
am: 13752ae25c

Change-Id: I87f095467a1a43bbbaf4b2b23762e3b801311d9c

otautil/Android.bp

diff --git a/otautil/Android.bp b/otautil/Android.bp
index 5905ba6..659fefa 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -29,6 +29,7 @@
     ],
 
     cflags: [
+        "-D_FILE_OFFSET_BITS=64",
         "-Werror",
         "-Wall",
     ],

otautil/SysUtil.cpp

diff --git a/otautil/SysUtil.cpp b/otautil/SysUtil.cpp
index d54a824..0655c47 100644
--- a/otautil/SysUtil.cpp
+++ b/otautil/SysUtil.cpp
@@ -100,7 +100,7 @@
   }
 
   // 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 @@
       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;