| Index: base/i18n/icu_util.cc
|
| diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
|
| index d7e45c3400d3419501f6feb70c6e7cae9e560ba4..08dbeb3c14c5dd50dd8e534f1e18625bf639c6d8 100644
|
| --- a/base/i18n/icu_util.cc
|
| +++ b/base/i18n/icu_util.cc
|
| @@ -28,6 +28,10 @@
|
| #include "base/android/apk_assets.h"
|
| #endif
|
|
|
| +#if defined(OS_IOS)
|
| +#include "base/ios/ios_util.h"
|
| +#endif
|
| +
|
| #if defined(OS_MACOSX)
|
| #include "base/mac/foundation_util.h"
|
| #endif
|
| @@ -124,6 +128,12 @@ void LazyInitIcuDataFile() {
|
| ScopedCFTypeRef<CFStringRef> data_file_name(
|
| SysUTF8ToCFStringRef(kIcuDataFileName));
|
| FilePath data_path = mac::PathForFrameworkBundleResource(data_file_name);
|
| +#if defined(OS_IOS)
|
| + FilePath override_data_path = base::ios::FilePathOfEmbeddedICU();
|
| + if (!override_data_path.empty()) {
|
| + data_path = override_data_path;
|
| + }
|
| +#endif // !defined(OS_IOS)
|
| if (data_path.empty()) {
|
| LOG(ERROR) << kIcuDataFileName << " not found in bundle";
|
| return;
|
|
|