trunk/src/content/content_tests.gypi - Issue 183863005: Revert 253938 "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: trunk/src/content/content_tests.gypi

Issue 183863005: Revert 253938 "Enable icu_use_data_file_flag on Android" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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 | « trunk/src/content/content_shell.gypi ('k') | trunk/src/content/public/android/java/src/org/chromium/content/browser/ResourceExtractor.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/content/content_tests.gypi

===================================================================

--- trunk/src/content/content_tests.gypi (revision 254018)

+++ trunk/src/content/content_tests.gypi (working copy)

@@ -1420,7 +1420,6 @@

'target_name': 'content_browsertests_apk',

'type': 'none',

'dependencies': [

- 'content.gyp:content_icudata',

'content.gyp:content_java',

'content_browsertests',

'content_java_test_support',

@@ -1433,13 +1432,6 @@

'native_lib_target': 'libcontent_browsertests',

'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',

- ],

- }],

- ],

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

@@ -1461,7 +1453,6 @@

'type': 'none',

'dependencies': [

'chromium_android_linker_test',

- 'content.gyp:content_icudata',

'content.gyp:content_java',

'content_shell_java',

@@ -1474,13 +1465,6 @@

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

'use_chromium_linker': '1',

'enable_chromium_linker_tests': '1',

- 'conditions': [

- ['icu_use_data_file_flag==1', {

- 'additional_input_paths': [

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

- ],

- }],

- ],

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