Index: components/translate.gypi |
diff --git a/components/translate.gypi b/components/translate.gypi |
index dfe328ff5857f7bd870fd9a779055a7eed9647ee..ba2adef381d5916f673825e42d852ed242f0ab33 100644 |
--- a/components/translate.gypi |
+++ b/components/translate.gypi |
@@ -111,6 +111,7 @@ |
'translate_core_common', |
'../base/base.gyp:base', |
'../url/url.gyp:url_lib', |
+ '../third_party/cld_2/cld_2.gyp:cld_2', |
], |
'include_dirs': [ |
'..', |
@@ -120,18 +121,6 @@ |
'translate/core/language_detection/language_detection_util.cc', |
'translate/core/language_detection/language_detection_util.h', |
], |
- 'conditions': [ |
- ['cld_version==1', { |
- 'dependencies': [ |
- '<(DEPTH)/third_party/cld/cld.gyp:cld', |
- ], |
- }], |
- ['cld_version==2', { |
- 'dependencies': [ |
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', |
- ], |
- }], |
- ], |
}, |
], |
'conditions': [ |
@@ -201,6 +190,7 @@ |
'../content/content.gyp:content_renderer', |
'../ipc/ipc.gyp:ipc', |
'../third_party/WebKit/public/blink.gyp:blink', |
+ '../third_party/cld_2/cld_2.gyp:cld_2', |
'../url/url.gyp:url_lib', |
'../v8/tools/gyp/v8.gyp:v8', |
], |
@@ -209,6 +199,8 @@ |
], |
'sources': [ |
# Note: sources list duplicated in GN build. |
+ 'translate/content/renderer/data_file_renderer_cld_data_provider.cc', |
+ 'translate/content/renderer/data_file_renderer_cld_data_provider.h', |
'translate/content/renderer/renderer_cld_data_provider.cc', |
'translate/content/renderer/renderer_cld_data_provider.h', |
'translate/content/renderer/renderer_cld_data_provider_factory.cc', |
@@ -218,17 +210,6 @@ |
'translate/content/renderer/translate_helper.cc', |
'translate/content/renderer/translate_helper.h', |
], |
- 'conditions': [ |
- ['cld_version==2', { |
- 'dependencies': [ |
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2', |
- ], |
- 'sources': [ |
- 'translate/content/renderer/data_file_renderer_cld_data_provider.cc', |
- 'translate/content/renderer/data_file_renderer_cld_data_provider.h', |
- ], |
- }], |
- ], |
}, |
], |
}], |