| Index: chrome/chrome_tests_unit.gypi
|
| diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
|
| index 2eeeb2bf4dc03b437c115ae4e35e4227f09d7753..f05dbe9ced36750a7e7670740e3ea63626ae6423 100644
|
| --- a/chrome/chrome_tests_unit.gypi
|
| +++ b/chrome/chrome_tests_unit.gypi
|
| @@ -2232,6 +2232,9 @@
|
| '../google_apis/google_apis.gyp:google_apis',
|
| '../skia/skia.gyp:skia',
|
| '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
|
| + # Unit tests should be independent of the CLD2 access mechanism,
|
| + # just use static for simplicity.
|
| + '../third_party/cld_2/cld_2.gyp:cld2_static',
|
| '../third_party/icu/icu.gyp:icui18n',
|
| '../third_party/icu/icu.gyp:icuuc',
|
| '../third_party/libxml/libxml.gyp:libxml',
|
| @@ -2527,12 +2530,6 @@
|
| '../ui/events/devices/events_devices.gyp:events_devices',
|
| ],
|
| }],
|
| - [ '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',
|
| @@ -2734,22 +2731,6 @@
|
| 'browser/extensions/blacklist_unittest.cc',
|
| ],
|
| }],
|
| - ['cld_version==1', {
|
| - 'defines': [
|
| - 'CLD_WINDOWS',
|
| - ],
|
| - 'direct_dependent_settings': {
|
| - 'defines': [
|
| - 'CLD_WINDOWS',
|
| - ],
|
| - },
|
| - 'sources': [
|
| - '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc',
|
| - ],
|
| - 'dependencies': [
|
| - '../third_party/cld/cld.gyp:cld',
|
| - ],
|
| - }],
|
| ['enable_app_list==1', {
|
| 'sources': [ '<@(chrome_unit_tests_app_list_sources)' ],
|
| 'dependencies': [
|
|
|