Index: chrome/chrome_tests_unit.gypi |
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi |
index 89a8e38af55decfad22fb16e019948103018d730..7225ac02c0082ce20310ac95d66cee16c385dd6f 100644 |
--- a/chrome/chrome_tests_unit.gypi |
+++ b/chrome/chrome_tests_unit.gypi |
@@ -489,14 +489,6 @@ |
'include_dirs': [ |
'..', |
], |
- 'defines': [ |
- 'CLD_WINDOWS', |
- ], |
- 'direct_dependent_settings': { |
- 'defines': [ |
- 'CLD_WINDOWS', |
- ], |
- }, |
'msvs_settings': { |
'VCLinkerTool': { |
'conditions': [ |
@@ -1947,7 +1939,6 @@ |
'../skia/ext/skia_utils_mac_unittest.mm', |
'../skia/ext/vector_canvas_unittest.cc', |
'../testing/gtest_mac_unittest.mm', |
- '../third_party/cld/encodings/compact_lang_det/compact_lang_det_unittest_small.cc', |
'../third_party/zlib/google/zip_reader_unittest.cc', |
'../third_party/zlib/google/zip_unittest.cc', |
'../tools/json_schema_compiler/test/additional_properties_unittest.cc', |
@@ -1985,7 +1976,6 @@ |
'../gpu/gpu.gyp:gpu_unittest_utils', |
'../media/media.gyp:media_test_support', |
'../ppapi/ppapi_internal.gyp:ppapi_unittest_shared', |
- '../third_party/cld/cld.gyp:cld', |
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', |
'../third_party/libjingle/libjingle.gyp:libjingle', |
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber', |
@@ -2642,6 +2632,22 @@ |
['exclude', '^browser/extensions/blacklist_unittest.cc'], |
], |
}], |
+ ['cld_version==0 or 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', |
+ ], |
+ }], |
], |
'target_conditions': [ |
['OS == "ios"', { |