Undo some of the large-file changes on Android, as only some of them are implemented.

runtime/bin/file_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
 #if defined(TARGET_OS_ANDROID)
 
 #include "bin/file.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 70 matching lines @@
 
 
 bool File::SetPosition(off64_t position) {
   ASSERT(handle_->fd() >= 0);
   return lseek64(handle_->fd(), position, SEEK_SET) >= 0;
 }
 
 
 bool File::Truncate(off64_t length) {
   ASSERT(handle_->fd() >= 0);
-  return TEMP_FAILURE_RETRY(ftruncate64(handle_->fd(), length) != -1);
+  return TEMP_FAILURE_RETRY(ftruncate(handle_->fd(), length) != -1);
 }
 
 
 bool File::Flush() {
   ASSERT(handle_->fd() >= 0);
   return TEMP_FAILURE_RETRY(fsync(handle_->fd()) != -1);
 }
 
 
 off64_t File::Length() {
   ASSERT(handle_->fd() >= 0);
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(fstat64(handle_->fd(), &st)) == 0) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(fstat(handle_->fd(), &st)) == 0) {
     return st.st_size;
   }
   return -1;
 }
 
 
 File* File::Open(const char* name, FileOpenMode mode) {
   // Report errors for non-regular files.
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(stat(name, &st)) == 0) {
     if (!S_ISREG(st.st_mode)) {
       errno = (S_ISDIR(st.st_mode)) ? EISDIR : ENOENT;
       return NULL;
     }
   }
   int flags = O_RDONLY;
   if ((mode & kWrite) != 0) {
     flags = (O_RDWR | O_CREAT);
   }
   if ((mode & kTruncate) != 0) {
     flags = flags | O_TRUNC;
   }
   flags |= O_CLOEXEC;
-  int fd = TEMP_FAILURE_RETRY(open64(name, flags, 0666));
+  int fd = TEMP_FAILURE_RETRY(open(name, flags, 0666));
   if (fd < 0) {
     return NULL;
   }
   if (((mode & kWrite) != 0) && ((mode & kTruncate) == 0)) {
     off64_t position = lseek64(fd, 0, SEEK_END);
     if (position < 0) {
       return NULL;
     }
   }
   return new File(new FileHandle(fd));
 }
 
 
 File* File::OpenStdio(int fd) {
   if (fd < 0 || 2 < fd) return NULL;
   return new File(new FileHandle(fd));
 }
 
 
 bool File::Exists(const char* name) {
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(stat(name, &st)) == 0) {
     return S_ISREG(st.st_mode);
   } else {
     return false;
   }
 }
 
 
 bool File::Create(const char* name) {
-  int fd = TEMP_FAILURE_RETRY(
-      open64(name, O_RDONLY | O_CREAT | O_CLOEXEC, 0666));
+  int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CREAT | O_CLOEXEC, 0666));
   if (fd < 0) {
     return false;
   }
   return (close(fd) == 0);
 }
 
 
 bool File::CreateLink(const char* name, const char* target) {
   int status = TEMP_FAILURE_RETRY(symlink(target, name));
   return (status == 0);
@@ skipping 43 matching lines @@
   } else if (type == kIsDirectory) {
     errno = EISDIR;
   } else {
     errno = EINVAL;
   }
   return false;
 }
 
 
 off64_t File::LengthFromPath(const char* name) {
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(stat(name, &st)) == 0) {
     return st.st_size;
   }
   return -1;
 }
 
 
 void File::Stat(const char* name, int64_t* data) {
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(stat(name, &st)) == 0) {
     if (S_ISREG(st.st_mode)) {
       data[kType] = kIsFile;
     } else if (S_ISDIR(st.st_mode)) {
       data[kType] = kIsDirectory;
     } else if (S_ISLNK(st.st_mode)) {
       data[kType] = kIsLink;
     } else {
       data[kType] = kDoesNotExist;
     }
     data[kCreatedTime] = st.st_ctime;
     data[kModifiedTime] = st.st_mtime;
     data[kAccessedTime] = st.st_atime;
     data[kMode] = st.st_mode;
     data[kSize] = st.st_size;
   } else {
     data[kType] = kDoesNotExist;
   }
 }
 
 
 time_t File::LastModified(const char* name) {
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(stat64(name, &st)) == 0) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(stat(name, &st)) == 0) {
     return st.st_mtime;
   }
   return -1;
 }
 
 
 char* File::LinkTarget(const char* pathname) {
-  struct stat64 link_stats;
-  if (lstat64(pathname, &link_stats) != 0) return NULL;
+  struct stat link_stats;
+  if (lstat(pathname, &link_stats) != 0) return NULL;
   if (!S_ISLNK(link_stats.st_mode)) {
     errno = ENOENT;
     return NULL;
   }
   size_t target_size = link_stats.st_size;
   char* target_name = reinterpret_cast<char*>(malloc(target_size + 1));
   size_t read_size = readlink(pathname, target_name, target_size + 1);
   if (read_size != target_size) {
     free(target_name);
     return NULL;
@@ skipping 32 matching lines @@
 }
 
 
 const char* File::StringEscapedPathSeparator() {
   return "/";
 }
 
 
 File::StdioHandleType File::GetStdioHandleType(int fd) {
   ASSERT(0 <= fd && fd <= 2);
-  struct stat64 buf;
-  int result = fstat64(fd, &buf);
+  struct stat buf;
+  int result = fstat(fd, &buf);
   if (result == -1) {
     const int kBufferSize = 1024;
     char error_message[kBufferSize];
     strerror_r(errno, error_message, kBufferSize);
     FATAL2("Failed stat on file descriptor %d: %s", fd, error_message);
   }
   if (S_ISCHR(buf.st_mode)) return kTerminal;
   if (S_ISFIFO(buf.st_mode)) return kPipe;
   if (S_ISSOCK(buf.st_mode)) return kSocket;
   if (S_ISREG(buf.st_mode)) return kFile;
   return kOther;
 }
 
 
 File::Type File::GetType(const char* pathname, bool follow_links) {
-  struct stat64 entry_info;
+  struct stat entry_info;
   int stat_success;
   if (follow_links) {
-    stat_success = TEMP_FAILURE_RETRY(stat64(pathname, &entry_info));
+    stat_success = TEMP_FAILURE_RETRY(stat(pathname, &entry_info));
   } else {
-    stat_success = TEMP_FAILURE_RETRY(lstat64(pathname, &entry_info));
+    stat_success = TEMP_FAILURE_RETRY(lstat(pathname, &entry_info));
   }
   if (stat_success == -1) return File::kDoesNotExist;
   if (S_ISDIR(entry_info.st_mode)) return File::kIsDirectory;
   if (S_ISREG(entry_info.st_mode)) return File::kIsFile;
   if (S_ISLNK(entry_info.st_mode)) return File::kIsLink;
   return File::kDoesNotExist;
 }
 
 
 File::Identical File::AreIdentical(const char* file_1, const char* file_2) {
-  struct stat64 file_1_info;
-  struct stat64 file_2_info;
-  if (TEMP_FAILURE_RETRY(lstat64(file_1, &file_1_info)) == -1 ||
-      TEMP_FAILURE_RETRY(lstat64(file_2, &file_2_info)) == -1) {
+  struct stat file_1_info;
+  struct stat file_2_info;
+  if (TEMP_FAILURE_RETRY(lstat(file_1, &file_1_info)) == -1 ||
+      TEMP_FAILURE_RETRY(lstat(file_2, &file_2_info)) == -1) {
     return File::kError;
   }
   return (file_1_info.st_ino == file_2_info.st_ino &&
           file_1_info.st_dev == file_2_info.st_dev) ?
       File::kIdentical :
       File::kDifferent;
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)