| Index: mojo/application/public/cpp/initialize_base_and_icu.cc
|
| diff --git a/mojo/application/public/cpp/initialize_base_and_icu.cc b/mojo/application/public/cpp/initialize_base_and_icu.cc
|
| index dd65129aaf90ba56dd296b4e6bb3e987ac0e7ec1..0496811bbc5ffbb6bb1ad5a2b798bc0872a73f86 100644
|
| --- a/mojo/application/public/cpp/initialize_base_and_icu.cc
|
| +++ b/mojo/application/public/cpp/initialize_base_and_icu.cc
|
| @@ -12,7 +12,10 @@
|
| #include "base/rand_util.h"
|
| #include "base/sys_info.h"
|
| #include "mojo/public/c/system/types.h"
|
| +
|
| +#if !defined(OS_ANDROID)
|
| #include "third_party/icu/source/i18n/unicode/timezone.h"
|
| +#endif
|
|
|
| extern "C" {
|
| #if defined(WIN32)
|
| @@ -34,10 +37,12 @@ InitializeBase(const uint8* icu_data) {
|
| // cause crashes.
|
| CHECK(base::i18n::InitializeICUFromRawMemory(icu_data));
|
|
|
| +#if !defined(OS_ANDROID)
|
| // ICU DateFormat class (used in base/time_format.cc) needs to get the
|
| // Olson timezone ID by accessing the zoneinfo files on disk. After
|
| // TimeZone::createDefault is called once here, the timezone ID is
|
| // cached and there's no more need to access the file system.
|
| scoped_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
|
| +#endif
|
| }
|
| }
|
|
|