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

Unified Diff: net/BUILD.gn

Issue 1258753002: Add yet more GN isolates ... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@isolates_4_2
Patch Set: add missing display_unittests_run target Created 5 years, 5 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: net/BUILD.gn
diff --git a/net/BUILD.gn b/net/BUILD.gn
index 75caf92173c2272b6c22cbab64eea80e66343916..98670419ff1b918c48b1504195e17a662b6ea67b 100644
--- a/net/BUILD.gn
+++ b/net/BUILD.gn
@@ -1309,6 +1309,14 @@ executable("quic_server") {
# TODO(GYP) make this compile on Android, we need some native test deps done.
# TODO(GYP) Also doesn't work on Mac, need to figure out why not.
if (!is_android && !is_mac) {
+ # TODO(GYP): Delete this after we've converted everything to GN.
+ # The _run targets exist only for compatibility w/ GYP.
+ group("net_unittests_run") {
+ testonly = true
+ deps = [
+ ":net_unittests",
+ ]
+ }
test("net_unittests") {
sources = gypi_values.net_test_sources
@@ -1343,13 +1351,25 @@ if (!is_android && !is_mac) {
data = [
"data/",
]
+
if (is_linux || is_mac || is_win) {
deps += [
"//third_party/pyftpdlib/",
"//third_party/pywebsocket/",
"//third_party/tlslite/",
]
- data += [ "tools/testserver/" ]
+ data_deps = [
+ "//third_party/pyftpdlib/",
+ "//third_party/pywebsocket/",
+ "//third_party/tlslite/",
+ ]
+ data += [
+ "tools/testserver/",
+ "//third_party/pyftpdlib/",
M-A Ruel 2015/07/26 00:51:24 Why are they needed both as data_deps and data?
Dirk Pranke 2015/07/26 17:52:53 same answer.
+ "//third_party/pywebsocket/",
+ "//third_party/tlslite/",
+ "$root_out_dir/pyproto/google/",
+ ]
}
if (is_desktop_linux) {
« chrome/test/BUILD.gn ('K') | « mojo/common/BUILD.gn ('k') | printing/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698