diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-22 16:58:38 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-10-25 14:24:50 +0100 |
| commit | 58d02015f8788a79b322c58d4bdbc914e4c333dc (patch) | |
| tree | dc5314263755b6ff95155e2678daa939b97fe066 /base/file_util.h | |
| parent | 7f92e4ca7bcb209f5d9b38cacaf3a1c6cbe493aa (diff) | |
| download | external_chromium-58d02015f8788a79b322c58d4bdbc914e4c333dc.zip external_chromium-58d02015f8788a79b322c58d4bdbc914e4c333dc.tar.gz external_chromium-58d02015f8788a79b322c58d4bdbc914e4c333dc.tar.bz2 | |
Syncing external/chroimum with chromium release 61029, base part 2
Removing old hacks that can be removed.
file_util_linux.cc was out of sync, there were no local changes so
just took the chromium version
Bug: 3123385
Change-Id: Ia73d28cdad39158e4703aaa991764189e9e13439
Diffstat (limited to 'base/file_util.h')
| -rw-r--r-- | base/file_util.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/base/file_util.h b/base/file_util.h index cdc5175..553f520 100644 --- a/base/file_util.h +++ b/base/file_util.h @@ -18,10 +18,6 @@ #endif #elif defined(OS_POSIX) #include <sys/stat.h> -#ifdef ANDROID -// TODO: Upstream this missing header. -#include <unistd.h> -#endif #endif #include <stdio.h> |