Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Support Crosswalk and Android System WebView in the same application #402

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions base/i18n/icu_util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ void LazyInitIcuDataFile() {
if (g_icudtl_pf != kInvalidPlatformFile) {
return;
}
//It's not correct to check and read from assets folder first, since xwalk
//put icudtl.dat in other folders like res/raw instead of assets.Reading
//from assets has a risk of conflict with android system webview.
//See https://crosswalk-project.org/jira/browse/XWALK-7004
#if 0
#if defined(OS_ANDROID)
int fd = base::android::OpenApkAsset(kAndroidAssetsIcuDataFileName,
&g_icudtl_region);
Expand All @@ -95,6 +100,7 @@ void LazyInitIcuDataFile() {
}
// For unit tests, data file is located on disk, so try there as a fallback.
#endif // defined(OS_ANDROID)
#endif
#if !defined(OS_MACOSX)
FilePath data_path;
#if defined(OS_WIN)
Expand Down