Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5246)

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: Make some of the harness factory methods private Created 6 years, 1 month 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 | « chrome/chrome_tests.gypi ('k') | chrome/test/base/chrome_unit_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index f774021432188bd40042efbc4b2249b0aa4fb028..83e6b747183e9bffa166554d599be5b7ba33995b 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2350,6 +2350,12 @@
'../ui/events/devices/events_devices.gyp:events_devices',
],
}],
+ [ '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',
@@ -2745,7 +2751,7 @@
'browser/extensions/blacklist_unittest.cc',
],
}],
- ['cld_version==0 or cld_version==1', {
+ ['cld_version==1', {
'defines': [
'CLD_WINDOWS',
],
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/test/base/chrome_unit_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698