| Index: net/ftp/ftp_directory_listing_parser_windows_unittest.cc
|
| diff --git a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
|
| index 7297676c9e0abadfa4c948e1ee1136ccef3b814b..2a08abe90a69c09edfe91edba645c4e6faf6d02f 100644
|
| --- a/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
|
| +++ b/net/ftp/ftp_directory_listing_parser_windows_unittest.cc
|
| @@ -38,12 +38,12 @@ TEST_F(FtpDirectoryListingParserWindowsTest, Good) {
|
| { "01-06-80 02:42AM 458 Corner3.txt",
|
| FtpDirectoryListingEntry::FILE, "Corner3.txt", 458,
|
| 1980, 1, 6, 2, 42 },
|
| -#if !defined(OS_LINUX)
|
| +#if !defined(OS_LINUX) && !defined(OS_ANDROID)
|
| // TODO(phajdan.jr): Re-enable when 2038-year problem is fixed on Linux.
|
| { "01-06-79 02:42AM 458 Corner4",
|
| FtpDirectoryListingEntry::FILE, "Corner4", 458,
|
| 2079, 1, 6, 2, 42 },
|
| -#endif // !defined (OS_LINUX)
|
| +#endif // !defined (OS_LINUX) && !defined(OS_ANDROID)
|
| { "01-06-1979 02:42AM 458 Readme.txt",
|
| FtpDirectoryListingEntry::FILE, "Readme.txt", 458,
|
| 1979, 1, 6, 2, 42 },
|
|
|