Skip to content

Commit

Permalink
build: modify include paths to be more bazel friendly (envoyproxy#16711)
Browse files Browse the repository at this point in the history 
Signed-off-by: Yan Avlasov <[email protected]>
  • Loading branch information
@yanavlasov
yanavlasov authored Jun 4, 2021
1 parent 5e5e3c2 commit 0fae697
Show file tree
Hide file tree
Showing 3,159 changed files with 11,186 additions and 11,628 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 0 additions & 2 deletions bazel/envoy_build_system.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ load(
_envoy_cc_posix_library = "envoy_cc_posix_library",
_envoy_cc_posix_without_linux_library = "envoy_cc_posix_without_linux_library",
_envoy_cc_win32_library = "envoy_cc_win32_library",
_envoy_include_prefix = "envoy_include_prefix",
_envoy_proto_library = "envoy_proto_library",
)
load(
Expand Down Expand Up @@ -225,7 +224,6 @@ envoy_cc_linux_library = _envoy_cc_linux_library
envoy_cc_posix_library = _envoy_cc_posix_library
envoy_cc_posix_without_linux_library = _envoy_cc_posix_without_linux_library
envoy_cc_win32_library = _envoy_cc_win32_library
envoy_include_prefix = _envoy_include_prefix
envoy_proto_library = _envoy_proto_library

# Test wrappers (from envoy_test.bzl)
Expand Down
14 changes: 4 additions & 10 deletions bazel/envoy_library.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def envoy_cc_library(
tags = [],
deps = [],
strip_include_prefix = None,
include_prefix = None,
textual_hdrs = None,
defines = []):
if tcmalloc_dep:
Expand All @@ -96,18 +97,18 @@ def envoy_cc_library(
tags = tags,
textual_hdrs = textual_hdrs,
deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + [
repository + "//include/envoy/common:base_includes",
repository + "//envoy/common:base_includes",
repository + "//source/common/common:fmt_lib",
envoy_external_dep_path("abseil_flat_hash_map"),
envoy_external_dep_path("abseil_flat_hash_set"),
envoy_external_dep_path("abseil_strings"),
envoy_external_dep_path("spdlog"),
envoy_external_dep_path("fmtlib"),
],
include_prefix = envoy_include_prefix(native.package_name()),
alwayslink = 1,
linkstatic = envoy_linkstatic(),
strip_include_prefix = strip_include_prefix,
include_prefix = include_prefix,
defines = defines,
)

Expand All @@ -121,6 +122,7 @@ def envoy_cc_library(
tags = ["nocompdb"] + tags,
deps = [":" + name],
strip_include_prefix = strip_include_prefix,
include_prefix = include_prefix,
)

# Used to specify a library that only builds on POSIX
Expand Down Expand Up @@ -185,14 +187,6 @@ def envoy_cc_win32_library(name, srcs = [], hdrs = [], **kargs):
**kargs
)

# Transform the package path (e.g. include/envoy/common) into a path for
# exporting the package headers at (e.g. envoy/common). Source files can then
# include using this path scheme (e.g. #include "envoy/common/time.h").
def envoy_include_prefix(path):
if path.startswith("source/") or path.startswith("include/"):
return "/".join(path.split("/")[1:])
return None

# Envoy proto targets should be specified with this function.
def envoy_proto_library(name, external_deps = [], **kwargs):
api_cc_py_proto_library(
Expand Down
4 changes: 2 additions & 2 deletions bazel/external/quiche.genrule_cmd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ cat <<EOF >sed_commands
/^#include/ s!"epoll_server/!"quiche/epoll_server/!
# The above global substitutions will prepend "quiche" to the platform code which we want to undo.
/^#include/ s!"quiche/common/quic/platform/!"common/quic/platform/!
/^#include/ s!"quiche/common/quic/platform/!"source/common/quic/platform/!
# Use envoy specific implementations for below platform APIs.
/^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"common/quic/platform/quiche_logging_impl.h!
/^#include/ s!"quiche_platform_impl/quiche_logging_impl.h!"source/common/quic/platform/quiche_logging_impl.h!
# The reset platform APIs use the QUICHE default implementations.
/^#include/ s!"quiche_platform_impl/!"quiche/common/platform/default/quiche_platform_impl/!
Expand Down
2 changes: 1 addition & 1 deletion ci/filter_example_setup.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
set -e

# This is the hash on https://github.com/envoyproxy/envoy-filter-example.git we pin to.
ENVOY_FILTER_EXAMPLE_GITSHA="dfdc226d44d1b7c300e6e691e2e8ada98b045edb"
ENVOY_FILTER_EXAMPLE_GITSHA="ac6a66a4a1c08138ccc03c23aafc9637b2df55a1"
ENVOY_FILTER_EXAMPLE_SRCDIR="${BUILD_DIR}/envoy-filter-example"

# shellcheck disable=SC2034
Expand Down
8 changes: 4 additions & 4 deletions include/envoy/access_log/BUILD → envoy/access_log/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ envoy_cc_library(
name = "access_log_interface",
hdrs = ["access_log.h"],
deps = [
"//include/envoy/config:typed_config_interface",
"//include/envoy/filesystem:filesystem_interface",
"//include/envoy/http:header_map_interface",
"//include/envoy/stream_info:stream_info_interface",
"//envoy/config:typed_config_interface",
"//envoy/filesystem:filesystem_interface",
"//envoy/http:header_map_interface",
"//envoy/stream_info:stream_info_interface",
"//source/common/protobuf",
],
)
2 changes: 1 addition & 1 deletion include/envoy/access_log/access_log.h → envoy/access_log/access_log.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "envoy/http/header_map.h"
#include "envoy/stream_info/stream_info.h"

#include "common/protobuf/protobuf.h"
#include "source/common/protobuf/protobuf.h"

namespace Envoy {
namespace AccessLog {
Expand Down
12 changes: 6 additions & 6 deletions include/envoy/api/BUILD → envoy/api/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ envoy_cc_library(
name = "api_interface",
hdrs = ["api.h"],
deps = [
"//include/envoy/common:random_generator_interface",
"//include/envoy/event:dispatcher_interface",
"//include/envoy/event:scaled_range_timer_manager_interface",
"//include/envoy/filesystem:filesystem_interface",
"//include/envoy/server:process_context_interface",
"//include/envoy/thread:thread_interface",
"//envoy/common:random_generator_interface",
"//envoy/event:dispatcher_interface",
"//envoy/event:scaled_range_timer_manager_interface",
"//envoy/filesystem:filesystem_interface",
"//envoy/server:process_context_interface",
"//envoy/thread:thread_interface",
],
)

Expand Down
0 include/envoy/api/api.h → envoy/api/api.h
View file
File renamed without changes.
0 include/envoy/api/io_error.h → envoy/api/io_error.h
View file
File renamed without changes.
0 include/envoy/api/os_sys_calls.h → envoy/api/os_sys_calls.h
View file
File renamed without changes.
0 include/envoy/api/os_sys_calls_common.h → envoy/api/os_sys_calls_common.h
View file
File renamed without changes.
0 include/envoy/api/os_sys_calls_hot_restart.h → envoy/api/os_sys_calls_hot_restart.h
View file
File renamed without changes.
0 include/envoy/api/os_sys_calls_linux.h → envoy/api/os_sys_calls_linux.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion include/envoy/buffer/BUILD → envoy/buffer/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ envoy_cc_library(
"abseil_inlined_vector",
],
deps = [
"//include/envoy/api:os_sys_calls_interface",
"//envoy/api:os_sys_calls_interface",
"//source/common/common:assert_lib",
"//source/common/common:byte_order_lib",
"//source/common/common:utility_lib",
Expand Down
6 changes: 3 additions & 3 deletions include/envoy/buffer/buffer.h → envoy/buffer/buffer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
#include "envoy/common/platform.h"
#include "envoy/common/pure.h"

#include "common/common/assert.h"
#include "common/common/byte_order.h"
#include "common/common/utility.h"
#include "source/common/common/assert.h"
#include "source/common/common/byte_order.h"
#include "source/common/common/utility.h"

#include "absl/container/inlined_vector.h"
#include "absl/strings/string_view.h"
Expand Down
5 changes: 2 additions & 3 deletions include/envoy/common/BUILD → envoy/common/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@ envoy_basic_cc_library(
"pure.h",
],
external_deps = ["abseil_optional"],
include_prefix = "envoy/common",
)

envoy_cc_library(
name = "conn_pool_interface",
hdrs = ["conn_pool.h"],
deps = [
"//include/envoy/event:deferred_deletable",
"//include/envoy/upstream:upstream_interface",
"//envoy/event:deferred_deletable",
"//envoy/upstream:upstream_interface",
],
)

Expand Down
0 include/envoy/common/backoff_strategy.h → envoy/common/backoff_strategy.h
View file
File renamed without changes.
0 include/envoy/common/callback.h → envoy/common/callback.h
View file
File renamed without changes.
0 include/envoy/common/conn_pool.h → envoy/common/conn_pool.h
View file
File renamed without changes.
0 include/envoy/common/crypto/BUILD → envoy/common/crypto/BUILD
View file
File renamed without changes.
0 include/envoy/common/crypto/crypto.h → envoy/common/crypto/crypto.h
View file
File renamed without changes.
0 include/envoy/common/exception.h → envoy/common/exception.h
View file
File renamed without changes.
0 include/envoy/common/interval_set.h → envoy/common/interval_set.h
View file
File renamed without changes.
0 include/envoy/common/matchers.h → envoy/common/matchers.h
View file
File renamed without changes.
0 include/envoy/common/mutex_tracer.h → envoy/common/mutex_tracer.h
View file
File renamed without changes.
0 include/envoy/common/optref.h → envoy/common/optref.h
View file
File renamed without changes.
0 include/envoy/common/platform.h → envoy/common/platform.h
View file
File renamed without changes.
0 include/envoy/common/pure.h → envoy/common/pure.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion include/envoy/common/random_generator.h → envoy/common/random_generator.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "envoy/common/pure.h"

#include "common/common/interval_value.h"
#include "source/common/common/interval_value.h"

namespace Envoy {
namespace Random {
Expand Down
0 include/envoy/common/regex.h → envoy/common/regex.h
View file
File renamed without changes.
0 include/envoy/common/resource.h → envoy/common/resource.h
View file
File renamed without changes.
0 include/envoy/common/scope_tracker.h → envoy/common/scope_tracker.h
View file
File renamed without changes.
0 include/envoy/common/time.h → envoy/common/time.h
View file
File renamed without changes.
0 include/envoy/common/token_bucket.h → envoy/common/token_bucket.h
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions include/envoy/compression/compressor/BUILD → envoy/compression/compressor/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ envoy_cc_library(
name = "compressor_interface",
hdrs = ["compressor.h"],
deps = [
"//include/envoy/buffer:buffer_interface",
"//envoy/buffer:buffer_interface",
],
)

Expand All @@ -29,7 +29,7 @@ envoy_cc_library(
hdrs = ["config.h"],
deps = [
":compressor_factory_interface",
"//include/envoy/config:typed_config_interface",
"//include/envoy/server:filter_config_interface",
"//envoy/config:typed_config_interface",
"//envoy/server:filter_config_interface",
],
)
0 ...envoy/compression/compressor/compressor.h → envoy/compression/compressor/compressor.h
View file
File renamed without changes.
0 ...ude/envoy/compression/compressor/config.h → envoy/compression/compressor/config.h
View file
File renamed without changes.
0 ...de/envoy/compression/compressor/factory.h → envoy/compression/compressor/factory.h
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions include/envoy/compression/decompressor/BUILD → envoy/compression/decompressor/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ envoy_cc_library(
hdrs = ["config.h"],
deps = [
":decompressor_factory_interface",
"//include/envoy/config:typed_config_interface",
"//include/envoy/server:filter_config_interface",
"//envoy/config:typed_config_interface",
"//envoy/server:filter_config_interface",
],
)

Expand All @@ -30,6 +30,6 @@ envoy_cc_library(
name = "decompressor_interface",
hdrs = ["decompressor.h"],
deps = [
"//include/envoy/buffer:buffer_interface",
"//envoy/buffer:buffer_interface",
],
)
0 ...e/envoy/compression/decompressor/config.h → envoy/compression/decompressor/config.h
View file
File renamed without changes.
0 ...y/compression/decompressor/decompressor.h → ...y/compression/decompressor/decompressor.h
View file
File renamed without changes.
0 .../envoy/compression/decompressor/factory.h → envoy/compression/decompressor/factory.h
View file
File renamed without changes.
10 changes: 5 additions & 5 deletions include/envoy/config/BUILD → envoy/config/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ envoy_cc_library(
hdrs = ["config_provider.h"],
external_deps = ["abseil_optional"],
deps = [
"//include/envoy/common:time_interface",
"//envoy/common:time_interface",
"//source/common/common:assert_lib",
"//source/common/protobuf",
],
Expand All @@ -24,7 +24,7 @@ envoy_cc_library(
hdrs = ["config_provider_manager.h"],
deps = [
":config_provider_interface",
"//include/envoy/server:filter_config_interface",
"//envoy/server:filter_config_interface",
"//source/common/protobuf",
],
)
Expand All @@ -33,7 +33,7 @@ envoy_cc_library(
name = "context_provider_interface",
hdrs = ["context_provider.h"],
deps = [
"//include/envoy/common:callback",
"//envoy/common:callback",
"@com_github_cncf_udpa//xds/core/v3:pkg_cc_proto",
],
)
Expand All @@ -49,7 +49,7 @@ envoy_cc_library(
hdrs = ["grpc_mux.h"],
deps = [
":subscription_interface",
"//include/envoy/stats:stats_macros",
"//envoy/stats:stats_macros",
"//source/common/common:cleanup_lib",
"//source/common/protobuf",
],
Expand All @@ -69,7 +69,7 @@ envoy_cc_library(
name = "subscription_interface",
hdrs = ["subscription.h"],
deps = [
"//include/envoy/stats:stats_macros",
"//envoy/stats:stats_macros",
"//source/common/config:api_type_oracle_lib",
"//source/common/protobuf",
"@envoy_api//envoy/service/discovery/v3:pkg_cc_proto",
Expand Down
4 changes: 2 additions & 2 deletions include/envoy/config/config_provider.h → envoy/config/config_provider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

#include "envoy/common/time.h"

#include "common/common/assert.h"
#include "common/protobuf/protobuf.h"
#include "source/common/common/assert.h"
#include "source/common/protobuf/protobuf.h"

#include "absl/types/optional.h"

Expand Down
2 changes: 1 addition & 1 deletion ...de/envoy/config/config_provider_manager.h → envoy/config/config_provider_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "envoy/config/config_provider.h"
#include "envoy/server/filter_config.h"

#include "common/protobuf/protobuf.h"
#include "source/common/protobuf/protobuf.h"

namespace Envoy {
namespace Config {
Expand Down
0 include/envoy/config/context_provider.h → envoy/config/context_provider.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../envoy/config/extension_config_provider.h → envoy/config/extension_config_provider.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "envoy/common/pure.h"

#include "common/protobuf/protobuf.h"
#include "source/common/protobuf/protobuf.h"

#include "absl/types/optional.h"

Expand Down
4 changes: 2 additions & 2 deletions include/envoy/config/grpc_mux.h → envoy/config/grpc_mux.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "envoy/config/subscription.h"
#include "envoy/stats/stats_macros.h"

#include "common/common/cleanup.h"
#include "common/protobuf/protobuf.h"
#include "source/common/common/cleanup.h"
#include "source/common/protobuf/protobuf.h"

namespace Envoy {
namespace Config {
Expand Down
2 changes: 1 addition & 1 deletion include/envoy/config/subscription.h → envoy/config/subscription.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "envoy/service/discovery/v3/discovery.pb.h"
#include "envoy/stats/stats_macros.h"

#include "common/protobuf/protobuf.h"
#include "source/common/protobuf/protobuf.h"

namespace Envoy {
namespace Config {
Expand Down
0 include/envoy/config/subscription_factory.h → envoy/config/subscription_factory.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions include/envoy/config/typed_config.h → envoy/config/typed_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include "envoy/common/pure.h"

#include "common/common/assert.h"
#include "common/protobuf/protobuf.h"
#include "source/common/common/assert.h"
#include "source/common/protobuf/protobuf.h"

namespace Envoy {
namespace Config {
Expand Down
2 changes: 1 addition & 1 deletion include/envoy/config/typed_metadata.h → envoy/config/typed_metadata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "envoy/common/pure.h"
#include "envoy/config/typed_config.h"

#include "common/protobuf/protobuf.h"
#include "source/common/protobuf/protobuf.h"

namespace Envoy {
namespace Config {
Expand Down
24 changes: 12 additions & 12 deletions include/envoy/event/BUILD → envoy/event/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@ envoy_cc_library(
":schedulable_cb_interface",
":signal_interface",
":timer_interface",
"//include/envoy/common:scope_tracker_interface",
"//include/envoy/common:time_interface",
"//include/envoy/filesystem:watcher_interface",
"//include/envoy/network:connection_handler_interface",
"//include/envoy/network:connection_interface",
"//include/envoy/network:dns_interface",
"//include/envoy/network:listen_socket_interface",
"//include/envoy/network:listener_interface",
"//include/envoy/network:transport_socket_interface",
"//include/envoy/server:watchdog_interface",
"//include/envoy/thread:thread_interface",
"//envoy/common:scope_tracker_interface",
"//envoy/common:time_interface",
"//envoy/filesystem:watcher_interface",
"//envoy/network:connection_handler_interface",
"//envoy/network:connection_interface",
"//envoy/network:dns_interface",
"//envoy/network:listen_socket_interface",
"//envoy/network:listener_interface",
"//envoy/network:transport_socket_interface",
"//envoy/server:watchdog_interface",
"//envoy/thread:thread_interface",
"@envoy_api//envoy/config/core/v3:pkg_cc_proto",
],
)
Expand Down Expand Up @@ -81,6 +81,6 @@ envoy_cc_library(
hdrs = ["timer.h"],
deps = [
":schedulable_cb_interface",
"//include/envoy/common:time_interface",
"//envoy/common:time_interface",
],
)
0 include/envoy/event/deferred_deletable.h → envoy/event/deferred_deletable.h
View file
File renamed without changes.
0 include/envoy/event/dispatcher.h → envoy/event/dispatcher.h
View file
File renamed without changes.
0 ...envoy/event/dispatcher_thread_deletable.h → envoy/event/dispatcher_thread_deletable.h
View file
File renamed without changes.
0 include/envoy/event/file_event.h → envoy/event/file_event.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../envoy/event/scaled_range_timer_manager.h → envoy/event/scaled_range_timer_manager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "envoy/event/scaled_timer.h"
#include "envoy/event/timer.h"

#include "common/common/interval_value.h"
#include "source/common/common/interval_value.h"

#include "absl/types/variant.h"

Expand Down
2 changes: 1 addition & 1 deletion include/envoy/event/scaled_timer.h → envoy/event/scaled_timer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <chrono>
#include <ostream>

#include "common/common/interval_value.h"
#include "source/common/common/interval_value.h"

#include "absl/container/flat_hash_map.h"
#include "absl/types/variant.h"
Expand Down
0 include/envoy/event/schedulable_cb.h → envoy/event/schedulable_cb.h
View file
File renamed without changes.
0 include/envoy/event/signal.h → envoy/event/signal.h
View file
File renamed without changes.
0 include/envoy/event/timer.h → envoy/event/timer.h
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions include/envoy/filesystem/BUILD → envoy/filesystem/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ envoy_cc_library(
name = "filesystem_interface",
hdrs = ["filesystem.h"],
deps = [
"//include/envoy/api:io_error_interface",
"//include/envoy/api:os_sys_calls_interface",
"//envoy/api:io_error_interface",
"//envoy/api:os_sys_calls_interface",
],
)

Expand Down
0 include/envoy/filesystem/filesystem.h → envoy/filesystem/filesystem.h
View file
File renamed without changes.
0 include/envoy/filesystem/watcher.h → envoy/filesystem/watcher.h
View file
File renamed without changes.
Loading

0 comments on commit 0fae697

Please sign in to comment.