Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(662)

Unified Diff: base/i18n/icu_util.cc

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: icudtl.dat made readable Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « DEPS ('k') | build/android/pylib/gtest/setup.py » ('j') | build/common.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/icu_util.cc
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index 5fa37f848e050a419bc074a81f12135cf1d2b2ac..bab2a321dfa02754cca3d7cd1a6ac30cb794a5d9 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -94,6 +94,8 @@ bool InitializeICU() {
#if defined(OS_WIN)
// The data file will be in the same directory as the current module.
bool path_ok = PathService::Get(base::DIR_MODULE, &data_path);
+#elif defined(OS_ANDROID)
+ bool path_ok = PathService::Get(base::DIR_ANDROID_APP_DATA, &data_path);
#else
// For now, expect the data file to be alongside the executable.
// This is sufficient while we work on unit tests, but will eventually
@@ -102,6 +104,7 @@ bool InitializeICU() {
#endif
DCHECK(path_ok);
data_path = data_path.AppendASCII(ICU_UTIL_DATA_FILE_NAME);
+ DVLOG(0) << "Looking for the icudata at " << data_path.AsUTF8Unsafe();
Mark Mentovai 2014/02/10 20:07:13 Necessary, or just spammy? There are already DLOG(
#else
// Assume it is in the framework bundle's Resources directory.
FilePath data_path =
« no previous file with comments | « DEPS ('k') | build/android/pylib/gtest/setup.py » ('j') | build/common.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698