Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

quiche: Improve build rules for (test only) library quic_port_utils. #6672

Merged
merged 1 commit into from
Apr 23, 2019
Merged

quiche: Improve build rules for (test only) library quic_port_utils. #6672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions bazel/external/quiche.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,9 @@ cc_library(
cc_library(
name = "quic_platform_port_utils",
testonly = 1,
hdrs = envoy_select_quiche(
["quiche/quic/platform/api/quic_port_utils.h"],
"@envoy",
),
hdrs = ["quiche/quic/platform/api/quic_port_utils.h"],
visibility = ["//visibility:public"],
deps = envoy_select_quiche(
["@envoy//source/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"],
"@envoy",
),
deps = ["@envoy//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_impl_lib"],
)

cc_library(
Expand Down
3 changes: 3 additions & 0 deletions bazel/external/quiche.genrule_cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ src_base_dir=$$(dirname $$(dirname $$(dirname $(rootpath quic/core/quic_constant

# sed commands to apply to each source file.
cat <<EOF >sed_commands
# Rewrite include directives for testonly platform impl files.
/^#include/ s!net/quic/platform/impl/quic_port_utils_impl.h!test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h!

# Rewrite include directives for platform impl files.
/^#include/ s!net/(http2|spdy|quic)/platform/impl/!extensions/quic_listeners/quiche/platform/!

Expand Down
7 changes: 0 additions & 7 deletions source/extensions/quic_listeners/quiche/platform/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,6 @@ envoy_cc_library(
visibility = ["//visibility:public"],
)

envoy_cc_test_library(
name = "quic_platform_port_utils_impl_lib",
hdrs = ["quic_port_utils_impl.h"],
include_prefix = "extensions/quic_listeners/quiche/platform",
deps = ["//test/extensions/quic_listeners/quiche/platform:quic_platform_port_utils_test_impl_lib"],
)

envoy_cc_library(
name = "quic_platform_logging_impl_lib",
srcs = ["quic_logging_impl.cc"],
Expand Down
11 changes: 0 additions & 11 deletions source/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions test/extensions/quic_listeners/quiche/platform/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ envoy_cc_test(
)

envoy_cc_test_library(
name = "quic_platform_port_utils_test_impl_lib",
srcs = ["quic_port_utils_test_impl.cc"],
hdrs = ["quic_port_utils_test_impl.h"],
name = "quic_platform_port_utils_impl_lib",
srcs = ["quic_port_utils_impl.cc"],
hdrs = ["quic_port_utils_impl.h"],
deps = [
"//source/common/network:utility_lib",
"//test/test_common:environment_lib",
Expand Down
2 changes: 1 addition & 1 deletion ...che/platform/quic_port_utils_test_impl.cc → ...s/quiche/platform/quic_port_utils_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// consumed or referenced directly by other Envoy code. It serves purely as a
// porting layer for QUICHE.

#include "test/extensions/quic_listeners/quiche/platform/quic_port_utils_test_impl.h"
#include "test/extensions/quic_listeners/quiche/platform/quic_port_utils_impl.h"

#include "envoy/network/address.h"

Expand Down
0 ...iche/platform/quic_port_utils_test_impl.h → ...rs/quiche/platform/quic_port_utils_impl.h
View file
Open in desktop
File renamed without changes.