build: modify include paths to be more bazel friendly

bazel/envoy_build_system.bzl

@@ -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(
@@ -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)

bazel/envoy_library.bzl

@@ -82,6 +82,7 @@ def envoy_cc_library(
         tags = [],
         deps = [],
         strip_include_prefix = None,
+        include_prefix = None,
         textual_hdrs = None,
         defines = []):
     if tcmalloc_dep:
@@ -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,
     )
 
@@ -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
@@ -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(

bazel/external/quiche.genrule_cmd

@@ -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/!

ci/filter_example_setup.sh

@@ -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

include/envoy/access_log/BUILD → envoy/access_log/BUILD

@@ -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",
     ],
 )

include/envoy/access_log/access_log.h → envoy/access_log/access_log.h

@@ -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 {

include/envoy/api/BUILD → envoy/api/BUILD

@@ -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",
     ],
 )
 

include/envoy/buffer/BUILD → envoy/buffer/BUILD

@@ -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",

include/envoy/buffer/buffer.h → envoy/buffer/buffer.h

@@ -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"

include/envoy/common/BUILD → envoy/common/BUILD

@@ -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",
     ],
 )
 

include/envoy/common/random_generator.h → envoy/common/random_generator.h

@@ -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 {

include/envoy/compression/compressor/BUILD → envoy/compression/compressor/BUILD

@@ -12,7 +12,7 @@ envoy_cc_library(
     name = "compressor_interface",
     hdrs = ["compressor.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )
 
@@ -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",
     ],
 )

include/envoy/compression/decompressor/BUILD → envoy/compression/decompressor/BUILD

@@ -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",
     ],
 )
 
@@ -30,6 +30,6 @@ envoy_cc_library(
     name = "decompressor_interface",
     hdrs = ["decompressor.h"],
     deps = [
-        "//include/envoy/buffer:buffer_interface",
+        "//envoy/buffer:buffer_interface",
     ],
 )

include/envoy/config/BUILD → envoy/config/BUILD

@@ -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",
     ],
@@ -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",
     ],
 )
@@ -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",
     ],
 )
@@ -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",
     ],
@@ -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",

include/envoy/config/config_provider.h → envoy/config/config_provider.h

@@ -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"
 

include/envoy/config/config_provider_manager.h → envoy/config/config_provider_manager.h

@@ -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 {

include/envoy/config/extension_config_provider.h → envoy/config/extension_config_provider.h

@@ -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"
 

include/envoy/config/grpc_mux.h → envoy/config/grpc_mux.h

@@ -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 {

include/envoy/config/subscription.h → envoy/config/subscription.h

@@ -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 {

include/envoy/config/typed_config.h → envoy/config/typed_config.h

@@ -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 {

include/envoy/config/typed_metadata.h → envoy/config/typed_metadata.h

@@ -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 {

include/envoy/event/BUILD → envoy/event/BUILD

@@ -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",
     ],
 )
@@ -81,6 +81,6 @@ envoy_cc_library(
     hdrs = ["timer.h"],
     deps = [
         ":schedulable_cb_interface",
-        "//include/envoy/common:time_interface",
+        "//envoy/common:time_interface",
     ],
 )

include/envoy/event/scaled_range_timer_manager.h → envoy/event/scaled_range_timer_manager.h

@@ -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"
 

include/envoy/event/scaled_timer.h → envoy/event/scaled_timer.h

@@ -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"

include/envoy/filesystem/BUILD → envoy/filesystem/BUILD

@@ -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",
     ],
 )