Upstream android file related code.

base/sys_info_posix.cc

Index: base/sys_info_posix.cc
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc
index d635eb4ada73c98e57f8b61547e396d0daf0ce28..2f86eff5be7702acbde97a409a551aecb30917e9 100644
--- a/base/sys_info_posix.cc
+++ b/base/sys_info_posix.cc
@@ -7,8 +7,13 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/param.h>
+#if defined(OS_ANDROID)

[joth, 2011/06/17 11:25:54]

this is unreliable as we may not have included base/basictypes yet.

The preferred format is to put conditional dependencies in their own section
after all other #includes i.e. just before namespace base { 

[michaelbai, 2011/06/17 22:41:29]

Done.

+#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
 #include <sys/utsname.h>
 #include <unistd.h>