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

Unified Diff: chrome/test/BUILD.gn

Issue 1259883007: Remove the Finch test 'CLD1VsCLD2' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 4 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_tests_unit.gypi ('k') | components/components_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index fe2eed865c77117c9489e95fa6a8bbb23618221e..432b3676a5d4485e4a124f0280da760b3ac22a92 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -449,7 +449,7 @@ if (!is_android) {
ldflags += [ "-Wl,-ObjC" ]
}
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Interactive tests should use whatever CLD2 data access mode that the
# application embedder is using.
deps += [ "//third_party/cld_2:cld2_platform_impl" ]
@@ -678,7 +678,7 @@ if (!is_android) {
# 'UseLibraryDependencyInputs': "true",
# }
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Because the browser_tests use translate, they need CLD data.
deps += [ "//third_party/cld_2:cld2_platform_impl" ]
}
@@ -1077,7 +1077,7 @@ if (!is_android) {
data_deps = [ "//third_party/mesa:osmesa" ]
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Language detection is irrelevant to sync, so it can depend on any
# implementation for CLD2. Dynamic is smaller, so go with dynamic.
deps += [ "//third_party/cld_2:cld2_dynamic" ]
@@ -1148,7 +1148,7 @@ if (!is_android) {
"//testing/gtest",
]
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Language detection is irrelevant to sync, so it can depend on any
# implementation for CLD2. Dynamic is smaller, so go with dynamic.
deps += [ "//third_party/cld_2:cld2_dynamic" ]
@@ -1612,7 +1612,7 @@ if (!is_android) {
} else {
sources -= [ "../browser/password_manager/password_store_x_unittest.cc" ]
}
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Unit tests should be independent of the CLD2 access mechanism, just use
# static for simplicity.
deps += [ "//third_party/cld_2:cld2_static" ]
@@ -1813,7 +1813,7 @@ if (!is_android) {
"//base/test:run_all_unittests",
"//base/test:test_support",
]
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Use whatever CLD2 data access mode that the
# application embedder is using.
deps += [ "//third_party/cld_2:cld2_platform_impl" ]
@@ -1860,7 +1860,7 @@ if (!is_android) {
sources -= [ "perf/mach_ports_performancetest.cc" ]
}
- if (cld_version == 0 || cld_version == 2) {
+ if (cld_version == 2) {
# Use whatever CLD2 data access mode that the
# application embedder is using.
deps += [ "//third_party/cld_2:cld2_platform_impl" ]
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | components/components_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698