Index: net/BUILD.gn |
diff --git a/net/BUILD.gn b/net/BUILD.gn |
index 8edf028427a2ec2ae52beaf4ef1d576591d3b966..4ae510f9871819d920dc9bcae7363355495d846f 100644 |
--- a/net/BUILD.gn |
+++ b/net/BUILD.gn |
@@ -1297,6 +1297,27 @@ 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) { |
+ if (is_linux) { |
+ # There are quic-related files with the same file name in different |
+ # directories. With our current object file mapping, these produce the |
+ # same .o files. Split these out into a second target to avoid the |
+ # collision. |
+ # TODO(brettw) fix the confusingly-named files. |
Nico
2015/06/30 20:38:46
Can you file a bug with some of the quic folks (rc
|
+ quic_dupe_files = [ |
+ "tools/quic/quic_client_session_test.cc", |
+ "tools/quic/test_tools/mock_quic_dispatcher.cc", |
+ "tools/quic/test_tools/mock_quic_dispatcher.h", |
+ "tools/quic/test_tools/quic_test_utils.cc", |
+ "tools/quic/test_tools/quic_test_utils.h", |
+ ] |
+ source_set("quic_de_dupe") { |
+ testonly = true |
+ if (is_linux) { |
+ sources = quic_dupe_files |
+ } |
+ } |
+ } |
+ |
test("net_unittests") { |
sources = gypi_values.net_test_sources |
@@ -1333,11 +1354,13 @@ if (!is_android && !is_mac) { |
} |
if (is_linux) { |
sources += gypi_values.net_linux_test_sources |
+ sources -= quic_dupe_files |
deps += [ |
":balsa", |
+ ":epoll_quic_tools", |
":epoll_server", |
":flip_in_mem_edsm_server_base", |
- ":epoll_quic_tools", |
+ ":quic_de_dupe", |
] |
} |