Chromium Code Reviews| Index: net/BUILD.gn |
| diff --git a/net/BUILD.gn b/net/BUILD.gn |
| index 7e2be2cabdf9df6cd45c6dac7ccf39db31e51ac9..0812d388b8de5bc13f8b97ccb97d18c65b13941b 100644 |
| --- a/net/BUILD.gn |
| +++ b/net/BUILD.gn |
| @@ -1311,8 +1311,18 @@ executable("quic_server") { |
| ] |
| } |
| -# TODO(GYP) bug 513775: Make this work on Mac. |
| -if (!is_mac) { |
| +# 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 |
| @@ -1351,13 +1361,25 @@ if (!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/", |
| + "//third_party/pywebsocket/", |
| + "//third_party/tlslite/", |
| + "$root_out_dir/pyproto/google/", |
| + ] |
|
Dirk Pranke
2015/07/28 23:50:05
This duplication (and related occurrences elsewher
|
| } |
| if (is_desktop_linux) { |