content/content_shell.gypi - Issue 156333002: Enable icu_use_data_file_flag on Android

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/content_shell.gypi

Issue 156333002: Enable icu_use_data_file_flag on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 6 years, 9 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/content_shell.gypi

diff --git a/content/content_shell.gypi b/content/content_shell.gypi

index ce837ff8a5113a0af31eee17980a44c9b0d2bac6..fa7f3212f1be0b745c195af0f7b8de5e7dd8a7f1 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -1044,6 +1044,7 @@

'target_name': 'content_shell_apk',

'type': 'none',

'dependencies': [

+ 'content.gyp:content_icudata',

'content.gyp:content_java',

'content_java_test_support',

'content_shell_java',

@@ -1064,6 +1065,13 @@

'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'],

'asset_location': '<(PRODUCT_DIR)/content_shell/assets',

'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],

+ 'conditions': [

+ ['icu_use_data_file_flag==1', {

+ 'additional_input_paths': [

+ '<(PRODUCT_DIR)/icudtl.dat',

+ ],

+ }],

+ ],

'conditions': [

['android_webview_build==0', {

« no previous file with comments | « content/content.gyp ('k') | content/content_tests.gypi » ('j') | no next file with comments »