Index: net/BUILD.gn |
diff --git a/net/BUILD.gn b/net/BUILD.gn |
index 8175b1665fb141af8c0eebc82b204c54fced27a1..06ab3f85935fafd2c2764024d8c7200d5cb7494f 100644 |
--- a/net/BUILD.gn |
+++ b/net/BUILD.gn |
@@ -701,6 +701,33 @@ source_set("test_support") { |
forward_dependent_configs_from = deps |
} |
+source_set("balsa") { |
+ sources = [ |
+ "tools/balsa/balsa_enums.h", |
+ "tools/balsa/balsa_frame.cc", |
+ "tools/balsa/balsa_frame.h", |
+ "tools/balsa/balsa_headers.cc", |
+ "tools/balsa/balsa_headers.h", |
+ "tools/balsa/balsa_headers_token_utils.cc", |
+ "tools/balsa/balsa_headers_token_utils.h", |
+ "tools/balsa/balsa_visitor_interface.h", |
+ "tools/balsa/http_message_constants.cc", |
+ "tools/balsa/http_message_constants.h", |
+ "tools/balsa/noop_balsa_visitor.h", |
+ "tools/balsa/simple_buffer.cc", |
+ "tools/balsa/simple_buffer.h", |
+ "tools/balsa/split.cc", |
+ "tools/balsa/split.h", |
+ "tools/balsa/string_piece_utils.h", |
+ "tools/quic/spdy_utils.cc", |
+ "tools/quic/spdy_utils.h", |
+ ] |
+ deps = [ |
+ ":net", |
+ "//base", |
+ ] |
+} |
+ |
if (use_v8_in_net) { |
component("net_with_v8") { |
sources = [ |
@@ -829,31 +856,6 @@ if (!is_ios && !is_android) { |
} |
if (is_linux) { |
- source_set("balsa") { |
- sources = [ |
- "tools/balsa/balsa_enums.h", |
- "tools/balsa/balsa_frame.cc", |
- "tools/balsa/balsa_frame.h", |
- "tools/balsa/balsa_headers.cc", |
- "tools/balsa/balsa_headers.h", |
- "tools/balsa/balsa_headers_token_utils.cc", |
- "tools/balsa/balsa_headers_token_utils.h", |
- "tools/balsa/balsa_visitor_interface.h", |
- "tools/balsa/http_message_constants.cc", |
- "tools/balsa/http_message_constants.h", |
- "tools/balsa/noop_balsa_visitor.h", |
- "tools/balsa/simple_buffer.cc", |
- "tools/balsa/simple_buffer.h", |
- "tools/balsa/split.cc", |
- "tools/balsa/split.h", |
- "tools/balsa/string_piece_utils.h", |
- ] |
- deps = [ |
- ":net", |
- "//base", |
- ] |
- } |
- |
static_library("epoll_server") { |
sources = [ |
"tools/epoll_server/epoll_server.cc", |
@@ -966,8 +968,6 @@ if (is_linux) { |
"tools/quic/quic_spdy_server_stream.h", |
"tools/quic/quic_time_wait_list_manager.h", |
"tools/quic/quic_time_wait_list_manager.cc", |
- "tools/quic/spdy_utils.cc", |
- "tools/quic/spdy_utils.h", |
] |
deps = [ |
":balsa", |
@@ -990,16 +990,6 @@ if (is_linux) { |
"//third_party/openssl", |
] |
} |
- |
- executable("quic_server") { |
- sources = [ "tools/quic/quic_server_bin.cc" ] |
- deps = [ |
- ":quic_base", |
- ":net", |
- "//base", |
- "//third_party/openssl", |
- ] |
- } |
} |
if (is_android) { |
@@ -1031,6 +1021,34 @@ if (is_android || is_linux) { |
# TODO(GYP) make this compile on Android, we need some native test deps done. |
if (!is_android) { |
+source_set("quic_tools") { |
+ sources = [ |
+ "quic/quic_dispatcher.cc", |
+ "quic/quic_dispatcher.h", |
+ "quic/quic_in_memory_cache.cc", |
+ "quic/quic_in_memory_cache.h", |
+ "quic/quic_per_connection_packet_writer.cc", |
+ "quic/quic_per_connection_packet_writer.h", |
+ "quic/quic_server.cc", |
+ "quic/quic_server.h", |
+ "quic/quic_server_packet_writer.cc", |
+ "quic/quic_server_packet_writer.h", |
+ "quic/quic_server_session.cc", |
+ "quic/quic_server_session.h", |
+ "quic/quic_spdy_server_stream.cc", |
+ "quic/quic_spdy_server_stream.h", |
+ "quic/quic_time_wait_list_manager.cc", |
+ "quic/quic_time_wait_list_manager.h", |
+ ] |
+ deps = [ |
+ ":balsa", |
+ ":net", |
+ "//base", |
+ "//base/third_party/dynamic_annotations", |
+ "//url", |
+ ] |
+} |
+ |
test("net_unittests") { |
sources = gypi_values.net_test_sources |
@@ -1040,6 +1058,7 @@ test("net_unittests") { |
deps = [ |
":http_server", |
":net", |
+ ":quic_tools", |
":test_support", |
"//base", |
"//base:i18n", |
@@ -1292,4 +1311,14 @@ test("net_unittests") { |
} |
} |
+executable("quic_server") { |
+ sources = [ "quic/quic_server_bin.cc" ] |
+ deps = [ |
+ ":quic_tools", |
+ ":net", |
+ "//base", |
+ "//third_party/openssl", |
+ ] |
+} |
+ |
} # !is_android |