Fix OSS QUICHE build. Move `quiche/quic/tools/web_transport_only_client*` into `io_*` globs since the header depends on `quic/core/io/quic_event_loop.h`. This puts it in the same globs as `quiche/quic/tools/quic_default_client*`. Add `@com_google_absl//absl/base` dependency to `io_tool_support` for `absl/base/casts.h`. PiperOrigin-RevId: 937491115
diff --git a/build/source_list.bzl b/build/source_list.bzl index 4077291..30e8046 100644 --- a/build/source_list.bzl +++ b/build/source_list.bzl
@@ -761,7 +761,6 @@ "quic/tools/quic_url.h", "quic/tools/simple_ticket_crypter.h", "quic/tools/web_transport_only_backend.h", - "quic/tools/web_transport_only_client.h", "quic/tools/web_transport_test_visitors.h", ] quiche_tool_support_srcs = [ @@ -786,7 +785,6 @@ "quic/tools/quic_url.cc", "quic/tools/simple_ticket_crypter.cc", "quic/tools/web_transport_only_backend.cc", - "quic/tools/web_transport_only_client.cc", ] quiche_test_support_hdrs = [ "common/platform/api/quiche_expect_bug.h", @@ -1075,6 +1073,7 @@ "quic/tools/quic_epoll_client_factory.h", "quic/tools/quic_event_loop_tools.h", "quic/tools/quic_server.h", + "quic/tools/web_transport_only_client.h", ] io_tool_support_srcs = [ "quic/core/io/event_loop_connecting_client_socket.cc", @@ -1096,6 +1095,7 @@ "quic/tools/quic_default_client.cc", "quic/tools/quic_epoll_client_factory.cc", "quic/tools/quic_server.cc", + "quic/tools/web_transport_only_client.cc", ] io_test_support_hdrs = [ "quic/test_tools/quic_mock_syscall_wrapper.h", @@ -1402,7 +1402,6 @@ "quic/tools/quic_simple_client_session_test.cc", "quic/tools/quic_tcp_like_trace_converter_test.cc", "quic/tools/simple_ticket_crypter_test.cc", - "quic/tools/web_transport_only_client_test.cc", "web_transport/encapsulated/encapsulated_web_transport_test.cc", "web_transport/test_tools/in_memory_stream_test.cc", "web_transport/web_transport_headers_test.cc", @@ -1427,6 +1426,7 @@ "quic/tools/quic_simple_server_session_test.cc", "quic/tools/quic_simple_server_stream_test.cc", "quic/tools/quic_url_test.cc", + "quic/tools/web_transport_only_client_test.cc", ] fuzzers_hdrs = [ ]
diff --git a/build/source_list.gni b/build/source_list.gni index e2f084a..96933eb 100644 --- a/build/source_list.gni +++ b/build/source_list.gni
@@ -761,7 +761,6 @@ "src/quiche/quic/tools/quic_url.h", "src/quiche/quic/tools/simple_ticket_crypter.h", "src/quiche/quic/tools/web_transport_only_backend.h", - "src/quiche/quic/tools/web_transport_only_client.h", "src/quiche/quic/tools/web_transport_test_visitors.h", ] quiche_tool_support_srcs = [ @@ -786,7 +785,6 @@ "src/quiche/quic/tools/quic_url.cc", "src/quiche/quic/tools/simple_ticket_crypter.cc", "src/quiche/quic/tools/web_transport_only_backend.cc", - "src/quiche/quic/tools/web_transport_only_client.cc", ] quiche_test_support_hdrs = [ "src/quiche/common/platform/api/quiche_expect_bug.h", @@ -1075,6 +1073,7 @@ "src/quiche/quic/tools/quic_epoll_client_factory.h", "src/quiche/quic/tools/quic_event_loop_tools.h", "src/quiche/quic/tools/quic_server.h", + "src/quiche/quic/tools/web_transport_only_client.h", ] io_tool_support_srcs = [ "src/quiche/quic/core/io/event_loop_connecting_client_socket.cc", @@ -1096,6 +1095,7 @@ "src/quiche/quic/tools/quic_default_client.cc", "src/quiche/quic/tools/quic_epoll_client_factory.cc", "src/quiche/quic/tools/quic_server.cc", + "src/quiche/quic/tools/web_transport_only_client.cc", ] io_test_support_hdrs = [ "src/quiche/quic/test_tools/quic_mock_syscall_wrapper.h", @@ -1403,7 +1403,6 @@ "src/quiche/quic/tools/quic_simple_client_session_test.cc", "src/quiche/quic/tools/quic_tcp_like_trace_converter_test.cc", "src/quiche/quic/tools/simple_ticket_crypter_test.cc", - "src/quiche/quic/tools/web_transport_only_client_test.cc", "src/quiche/web_transport/encapsulated/encapsulated_web_transport_test.cc", "src/quiche/web_transport/test_tools/in_memory_stream_test.cc", "src/quiche/web_transport/web_transport_headers_test.cc", @@ -1429,6 +1428,7 @@ "src/quiche/quic/tools/quic_simple_server_session_test.cc", "src/quiche/quic/tools/quic_simple_server_stream_test.cc", "src/quiche/quic/tools/quic_url_test.cc", + "src/quiche/quic/tools/web_transport_only_client_test.cc", ] fuzzers_hdrs = [
diff --git a/build/source_list.json b/build/source_list.json index 2444384..f8008d3 100644 --- a/build/source_list.json +++ b/build/source_list.json
@@ -760,7 +760,6 @@ "quiche/quic/tools/quic_url.h", "quiche/quic/tools/simple_ticket_crypter.h", "quiche/quic/tools/web_transport_only_backend.h", - "quiche/quic/tools/web_transport_only_client.h", "quiche/quic/tools/web_transport_test_visitors.h" ], "quiche_tool_support_srcs": [ @@ -784,8 +783,7 @@ "quiche/quic/tools/quic_tcp_like_trace_converter.cc", "quiche/quic/tools/quic_url.cc", "quiche/quic/tools/simple_ticket_crypter.cc", - "quiche/quic/tools/web_transport_only_backend.cc", - "quiche/quic/tools/web_transport_only_client.cc" + "quiche/quic/tools/web_transport_only_backend.cc" ], "quiche_test_support_hdrs": [ "quiche/common/platform/api/quiche_expect_bug.h", @@ -1073,7 +1071,8 @@ "quiche/quic/tools/quic_default_client.h", "quiche/quic/tools/quic_epoll_client_factory.h", "quiche/quic/tools/quic_event_loop_tools.h", - "quiche/quic/tools/quic_server.h" + "quiche/quic/tools/quic_server.h", + "quiche/quic/tools/web_transport_only_client.h" ], "io_tool_support_srcs": [ "quiche/quic/core/io/event_loop_connecting_client_socket.cc", @@ -1094,7 +1093,8 @@ "quiche/quic/tools/quic_client_default_network_helper.cc", "quiche/quic/tools/quic_default_client.cc", "quiche/quic/tools/quic_epoll_client_factory.cc", - "quiche/quic/tools/quic_server.cc" + "quiche/quic/tools/quic_server.cc", + "quiche/quic/tools/web_transport_only_client.cc" ], "io_test_support_hdrs": [ "quiche/quic/test_tools/quic_mock_syscall_wrapper.h", @@ -1402,7 +1402,6 @@ "quiche/quic/tools/quic_simple_client_session_test.cc", "quiche/quic/tools/quic_tcp_like_trace_converter_test.cc", "quiche/quic/tools/simple_ticket_crypter_test.cc", - "quiche/quic/tools/web_transport_only_client_test.cc", "quiche/web_transport/encapsulated/encapsulated_web_transport_test.cc", "quiche/web_transport/test_tools/in_memory_stream_test.cc", "quiche/web_transport/web_transport_headers_test.cc", @@ -1427,7 +1426,8 @@ "quiche/quic/tools/quic_server_test.cc", "quiche/quic/tools/quic_simple_server_session_test.cc", "quiche/quic/tools/quic_simple_server_stream_test.cc", - "quiche/quic/tools/quic_url_test.cc" + "quiche/quic/tools/quic_url_test.cc", + "quiche/quic/tools/web_transport_only_client_test.cc" ], "fuzzers_hdrs": [
diff --git a/quiche/BUILD.bazel b/quiche/BUILD.bazel index 9940d8a..bbd0ea4 100644 --- a/quiche/BUILD.bazel +++ b/quiche/BUILD.bazel
@@ -362,6 +362,7 @@ "@boringssl//:crypto", "@boringssl//:ssl", "@com_google_absl//absl/algorithm:container", + "@com_google_absl//absl/base", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/base:no_destructor", "@com_google_absl//absl/base:nullability",