chrome/chrome_tests_unit.gypi - Issue 461633002: Refactor language detection logic to allow non-static CLD data sources.

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: chrome/chrome_tests_unit.gypi

Issue 461633002: Refactor language detection logic to allow non-static CLD data sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix linux/mac/windows compile issues Created 6 years, 2 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

« chrome/browser/translate/cld_data_harness_factory.cc ('K') | « chrome/chrome_tests.gypi ('k') | components/components_tests.gyp » ('j') | components/translate/content/browser/browser_cld_data_provider_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/chrome_tests_unit.gypi

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi

index 405f75d8eb797dfa8635fa39b15f63e359dce62b..d7c483a93cf942b853678adfe3f85d31f5619608 100644

--- a/chrome/chrome_tests_unit.gypi

+++ b/chrome/chrome_tests_unit.gypi

@@ -2340,6 +2340,12 @@

'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',

}],

+ [ 'cld_version==0 or cld_version==2', {

+ 'dependencies': [

+ # Unit tests should be independent of the CLD2 access mechanism,

+ # just use static for simplicity.

+ '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],

+ }],

['OS=="linux"', {

'dependencies': [

'../build/linux/system.gyp:ssl',

@@ -2731,7 +2737,7 @@

'browser/extensions/blacklist_unittest.cc',

}],

- ['cld_version==0 or cld_version==1', {

+ ['cld_version==1', {

'defines': [

'CLD_WINDOWS',