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

Unified Diff: chrome/chrome_tests.gypi

Issue 1920853002: Drop support for Compact Language Detector v1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Preserve yfriedman@ comment in chrome/android/chrome_apk.gyp Created 4 years, 8 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
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 08372c541c14cb9f8389486283c1f6ee2651ebf1..274c5f294b077fbcadf8b977c9e140fb1ec79993 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1673,6 +1673,7 @@
'../sync/sync.gyp:sync',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ '../third_party/cld_2/cld_2.gyp:cld2_platform_impl',
'../third_party/hunspell/hunspell.gyp:hunspell',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
@@ -1695,12 +1696,6 @@
'<@(chrome_interactive_ui_test_sources)',
],
'conditions': [
- [ 'cld_version==2', {
- 'dependencies': [
- # Interactive tests should use whatever CLD2 data access mode that
- # the application embedder is using.
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
- }],
['use_x11==1', {
'dependencies': [
'../build/linux/system.gyp:xtst',
@@ -2199,6 +2194,7 @@
'../testing/gtest.gyp:gtest',
'../testing/perf/perf_test.gyp:*',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
+ '../third_party/cld_2/cld_2.gyp:cld2_platform_impl',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ -2300,11 +2296,6 @@
'<@(chrome_browser_tests_display_source_apitest)',
],
}],
- [ 'cld_version==2', {
- 'dependencies': [
- # Because the browser_tests use translate, they need CLD data.
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
- }],
['enable_one_click_signin==0', {
'sources!': [
'browser/ui/sync/one_click_signin_links_delegate_impl_browsertest.cc',
@@ -2764,6 +2755,7 @@
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../testing/perf/perf_test.gyp:*',
+ '../third_party/cld_2/cld_2.gyp:cld2_platform_impl',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ -2818,12 +2810,6 @@
},
],
'conditions': [
- [ 'cld_version==2', {
- 'dependencies': [
- # Interactive tests should use whatever CLD2 data access mode that
- # the application embedder is using.
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
- }],
['OS=="win"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
@@ -2968,6 +2954,10 @@
'../sync/sync.gyp:sync',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ # Language detection is irrelevant to sync, so it can depend on
+ # any implementation for CLD2. Dynamic is smaller, so go with
+ # dynamic.
+ '../third_party/cld_2/cld_2.gyp:cld2_dynamic',
'../third_party/icu/icu.gyp:icui18n',
'../third_party/icu/icu.gyp:icuuc',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
@@ -2986,13 +2976,6 @@
'<@(sync_integration_tests_sources)',
],
'conditions': [
- [ 'cld_version==2', {
- 'dependencies': [
- # Language detection is irrelevant to sync, so it can depend on
- # any implementation for CLD2. Dynamic is smaller, so go with
- # dynamic.
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
- }],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
@@ -3076,6 +3059,10 @@
'../sync/sync.gyp:sync',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
+ # Language detection is irrelevant to sync, so it can depend on
+ # any implementation for CLD2. Dynamic is smaller, so go with
+ # dynamic.
+ '../third_party/cld_2/cld_2.gyp:cld2_dynamic',
],
'include_dirs': [
'..',
@@ -3089,13 +3076,6 @@
'<@(sync_performance_tests_sources)',
],
'conditions': [
- [ 'cld_version==2', {
- 'dependencies': [
- # Language detection is irrelevant to sync, so it can depend on
- # any implementation for CLD2. Dynamic is smaller, so go with
- # dynamic.
- '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_dynamic', ],
- }],
['OS=="linux"', {
'dependencies': [
'../build/linux/system.gyp:ssl',
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698