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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 22867032: Use Finch to compare the performances of CLD1 and CLD2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Stop using CLD2 on Windows once Created 7 years, 3 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
Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index d7e4e8485706e341bbc886195cfd5e8290300f07..aa3b9f2c7c0adf7b0bcbd47ba01e8fb584b2dcb1 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -487,14 +487,6 @@
'include_dirs': [
'..',
],
- 'defines': [
- 'CLD_WINDOWS',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'CLD_WINDOWS',
- ],
- },
'msvs_settings': {
'VCLinkerTool': {
'conditions': [
@@ -1937,7 +1929,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',
@@ -1975,7 +1966,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',
@@ -2633,6 +2623,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"', {
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | chrome/common/DEPS » ('j') | third_party/cld_2/README.chromium » ('J')

Powered by Google App Engine
This is Rietveld 408576698