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

runtime/bin/directory_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/directory.h"
 
 #include <dirent.h>  // NOLINT
@@ skipping 111 matching lines @@
         if (!listing->follow_links()) {
           return kListLink;
         }
         // Else fall through to next case.
         // Fall through.
       case DT_UNKNOWN: {
         // On some file systems the entry type is not determined by
         // readdir_r. For those and for links we use stat to determine
         // the actual entry type. Notice that stat returns the type of
         // the file pointed to.
-        struct stat64 entry_info;
+        struct stat entry_info;
         int stat_success;
         stat_success = TEMP_FAILURE_RETRY(
-            lstat64(listing->path_buffer().AsString(), &entry_info));
+            lstat(listing->path_buffer().AsString(), &entry_info));
         if (stat_success == -1) {
           return kListError;
         }
         if (listing->follow_links() && S_ISLNK(entry_info.st_mode)) {
           // Check to see if we are in a loop created by a symbolic link.
           LinkList current_link = { entry_info.st_dev,
                                     entry_info.st_ino,
                                     link_ };
           LinkList* previous = link_;
           while (previous != NULL) {
             if (previous->dev == current_link.dev &&
                 previous->ino == current_link.ino) {
               // Report the looping link as a link, rather than following it.
               return kListLink;
             }
             previous = previous->next;
           }
           stat_success = TEMP_FAILURE_RETRY(
-              stat64(listing->path_buffer().AsString(), &entry_info));
+              stat(listing->path_buffer().AsString(), &entry_info));
           if (stat_success == -1) {
             // Report a broken link as a link, even if follow_links is true.
             return kListLink;
           }
           if (S_ISDIR(entry_info.st_mode)) {
             // Recurse into the subdirectory with current_link added to the
             // linked list of seen file system links.
             link_ = new LinkList(current_link);
             if (strcmp(entry.d_name, ".") == 0) return Next(listing);
             if (strcmp(entry.d_name, "..") == 0) return Next(listing);
@@ skipping 58 matching lines @@
                       PathBuffer* path) {
   if (strcmp(dir_name, ".") == 0) return true;
   if (strcmp(dir_name, "..") == 0) return true;
   return path->Add(dir_name) && DeleteRecursively(path);
 }
 
 
 static bool DeleteRecursively(PathBuffer* path) {
   // Do not recurse into links for deletion. Instead delete the link.
   // If it's a file, delete it.
-  struct stat64 st;
-  if (TEMP_FAILURE_RETRY(lstat64(path->AsString(), &st)) == -1) {
+  struct stat st;
+  if (TEMP_FAILURE_RETRY(lstat(path->AsString(), &st)) == -1) {
     return false;
   } else if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
     return (unlink(path->AsString()) == 0);
   }
 
   if (!path->Add(File::PathSeparator())) return false;
 
   // Not a link. Attempt to open as a directory and recurse into the
   // directory.
   DIR* dir_pointer;
@@ skipping 24 matching lines @@
       case DT_LNK:
         // Treat all links as files. This will delete the link which
         // is what we want no matter if the link target is a file or a
         // directory.
         success = success && DeleteFile(entry.d_name, path);
         break;
       case DT_UNKNOWN: {
         // On some file systems the entry type is not determined by
         // readdir_r. For those we use lstat to determine the entry
         // type.
-        struct stat64 entry_info;
+        struct stat entry_info;
         if (!path->Add(entry.d_name)) {
           success = false;
           break;
         }
         int lstat_success = TEMP_FAILURE_RETRY(
-            lstat64(path->AsString(), &entry_info));
+            lstat(path->AsString(), &entry_info));
         if (lstat_success == -1) {
           success = false;
           break;
         }
         path->Reset(path_length);
         if (S_ISDIR(entry_info.st_mode)) {
           success = success && DeleteDir(entry.d_name, path);
         } else if (S_ISREG(entry_info.st_mode) || S_ISLNK(entry_info.st_mode)) {
           // Treat links as files. This will delete the link which is
           // what we want no matter if the link target is a file or a
@@ skipping 11 matching lines @@
   if ((read != 0) ||
       (closedir(dir_pointer) == -1) ||
       (remove(path->AsString()) == -1)) {
     return false;
   }
   return success;
 }
 
 
 Directory::ExistsResult Directory::Exists(const char* dir_name) {
-  struct stat64 entry_info;
-  int success = TEMP_FAILURE_RETRY(stat64(dir_name, &entry_info));
+  struct stat entry_info;
+  int success = TEMP_FAILURE_RETRY(stat(dir_name, &entry_info));
   if (success == 0) {
     if (S_ISDIR(entry_info.st_mode)) {
       return EXISTS;
     } else {
       return DOES_NOT_EXIST;
     }
   } else {
     if (errno == EACCES ||
         errno == EBADF ||
         errno == EFAULT ||
@@ skipping 59 matching lines @@
 
 char* Directory::SystemTemp() {
   // Android does not have a /tmp directory. A partial substitute,
   // suitable for bring-up work and tests, is to create a tmp
   // directory in /data/local/tmp.
   //
   // TODO(4413): In the long run, when running in an application we should
   // probably use the appropriate directory from the Android API,
   // probably what File.createTempFile uses.
 #define ANDROID_TEMP_DIR "/data/local/tmp"
-  struct stat64 st;
-  if (stat64(ANDROID_TEMP_DIR, &st) != 0) {
+  struct stat st;
+  if (stat(ANDROID_TEMP_DIR, &st) != 0) {
     mkdir(ANDROID_TEMP_DIR, 0777);
   }
   return strdup(ANDROID_TEMP_DIR);
 }
 
 
 char* Directory::CreateTemp(const char* prefix) {
   // Returns a new, unused directory name, adding characters to the end
   // of prefix.  Creates the directory with the permissions specified
   // by the process umask.
@@ skipping 35 matching lines @@
 bool Directory::Rename(const char* path, const char* new_path) {
   ExistsResult exists = Exists(path);
   if (exists != EXISTS) return false;
   return (TEMP_FAILURE_RETRY(rename(path, new_path)) == 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)