Upstream android file related code.

base/sys_info_posix.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <errno.h>
 #include <string.h>
 #include <sys/param.h>
-#include <sys/statvfs.h>
-#include <sys/sysctl.h>
 #include <sys/utsname.h>
 #include <unistd.h>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 
+#if defined(OS_ANDROID)
+#include <sys/vfs.h>
+#define statvfs statfs  // Android uses a statvfs-like statfs struct and call.
+#else
+#include <sys/statvfs.h>
+#include <sys/sysctl.h>
+#endif
+
 namespace base {
 
 #if !defined(OS_OPENBSD)
 int SysInfo::NumberOfProcessors() {
   // It seems that sysconf returns the number of "logical" processors on both
   // Mac and Linux.  So we get the number of "online logical" processors.
   long res = sysconf(_SC_NPROCESSORS_ONLN);
   if (res == -1) {
     NOTREACHED();
     return 1;
@@ skipping 43 matching lines @@
   }
   return std::string(info.machine);
 }
 
 // static
 size_t SysInfo::VMAllocationGranularity() {
   return getpagesize();
 }
 
 }  // namespace base