content/browser/child_process_launcher.cc - Issue 2241753002: [Android] Fix icu_use_data_file = false.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/child_process_launcher.cc

Issue 2241753002: [Android] Fix icu_use_data_file = false. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix unused variable 'g_fds' Created 4 years, 4 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:

Index: content/browser/child_process_launcher.cc

diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc

index 5d7a304e67e0edc18048df5a252ce10f7e033481..84b955937d18d3c130453946bc81e9bbd75ff8c0 100644

--- a/content/browser/child_process_launcher.cc

+++ b/content/browser/child_process_launcher.cc

@@ -238,9 +238,11 @@ void LaunchOnLauncherThread(const NotifyCallback& callback,

#endif // defined(OS_POSIX) && !defined(OS_MACOSX)

#if defined(OS_ANDROID)

+#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE

files_to_register->Share(

kAndroidICUDataDescriptor,

base::i18n::GetIcuDataFileHandle(&regions[kAndroidICUDataDescriptor]));

+#endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE

// Android WebView runs in single process, ensure that we never get here

// when running in single process mode.