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

Unified Diff: content/test/BUILD.gn

Issue 889203002: Disable more GN linking on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | « components/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 4cf33a43d374c555975c4f3e05fb4ac86c6111e0..e91d0d5238005e7d14058963fb957c0742001cc7 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -246,7 +246,7 @@ if (!is_ios) {
} # !is_ios
# TODO(GYP) enable content_browsertests on Mac when it links.
-if (!is_mac) {
+if (!is_mac && (!is_win || link_chrome_on_windows)) {
test("content_browsertests") {
sources =
rebase_path(content_tests_gypi_values.content_browsertests_sources,
@@ -429,7 +429,7 @@ if (!is_mac) {
}
}
-if (!is_mac) { # TODO(GYP) enable on Mac once it links.
+if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac once it links.
test("content_unittests") {
sources = rebase_path(content_tests_gypi_values.content_unittests_sources,
".",
@@ -622,7 +622,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links.
}
}
-if (!is_mac) { # TODO(GYP) enable on Mac once it links.
+if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac once it links.
test("content_perftests") {
sources = [
"../browser/renderer_host/input/input_router_impl_perftest.cc",
« no previous file with comments | « components/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698