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: copy icudtl.dat to assets directory to be included in apk 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:

Index: content/content_shell.gypi

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

index eedf4ffd9f5ba5a16dd15eb48d636c065676787c..75e3a9df87b6959740856515d6155fd13ab1a966 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -1060,6 +1060,13 @@

'native_lib_target': 'libcontent_shell_content_view',

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

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

+ 'conditions': [

+ ['icu_use_data_file_flag==1', {

+ 'additional_input_paths': [

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

+ ],

+ }],

+ ],

'conditions': [

['android_webview_build==0', {

@@ -1067,6 +1074,16 @@

'../tools/imagediff/image_diff.gyp:image_diff#host',

}],

+ ['icu_use_data_file_flag==1', {

+ 'copies': [

+ {

+ 'destination': '<(asset_location)',

+ 'files': [

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

+ ],

+ }

+ ],

+ }],

'includes': [ '../build/java_apk.gypi' ],