diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl index 4d671ab9562fa..644824f19e830 100644 --- a/bazel/envoy_build_system.bzl +++ b/bazel/envoy_build_system.bzl @@ -44,6 +44,7 @@ load( ) load( "@envoy_build_config//:extensions_build_config.bzl", + "CONTRIB_EXTENSION_PACKAGE_VISIBILITY", "EXTENSION_PACKAGE_VISIBILITY", ) load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") @@ -65,7 +66,7 @@ def envoy_extension_package(enabled_default = True, default_visibility = EXTENSI ) def envoy_contrib_package(): - envoy_extension_package(default_visibility = ["//:contrib_library"]) + envoy_extension_package(default_visibility = CONTRIB_EXTENSION_PACKAGE_VISIBILITY) # A genrule variant that can output a directory. This is useful when doing things like # generating a fuzz corpus mechanically. diff --git a/bazel/envoy_library.bzl b/bazel/envoy_library.bzl index ac74d1be29c96..5b1d674483c8a 100644 --- a/bazel/envoy_library.bzl +++ b/bazel/envoy_library.bzl @@ -12,6 +12,7 @@ load(":envoy_pch.bzl", "envoy_pch_copts") load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library") load( "@envoy_build_config//:extensions_build_config.bzl", + "CONTRIB_EXTENSION_PACKAGE_VISIBILITY", "EXTENSION_CONFIG_VISIBILITY", ) @@ -75,7 +76,7 @@ def envoy_cc_contrib_extension( name, tags = [], extra_visibility = [], - visibility = ["//:contrib_library"], + visibility = CONTRIB_EXTENSION_PACKAGE_VISIBILITY, **kwargs): envoy_cc_extension(name, tags, extra_visibility, visibility, **kwargs) diff --git a/ci/osx-build-config/extensions_build_config.bzl b/ci/osx-build-config/extensions_build_config.bzl index 40c8fee0685e8..379d6748e5a95 100644 --- a/ci/osx-build-config/extensions_build_config.bzl +++ b/ci/osx-build-config/extensions_build_config.bzl @@ -14,3 +14,4 @@ EXTENSIONS = { WINDOWS_EXTENSIONS = {} EXTENSION_CONFIG_VISIBILITY = ["//:extension_config"] EXTENSION_PACKAGE_VISIBILITY = ["//:extension_library"] +CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//:contrib_library"] diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl index 907828f07f8c6..d7447fbc82c8a 100644 --- a/source/extensions/extensions_build_config.bzl +++ b/source/extensions/extensions_build_config.bzl @@ -303,3 +303,4 @@ EXTENSIONS = { # need to directly reference Envoy extensions. EXTENSION_CONFIG_VISIBILITY = ["//:extension_config"] EXTENSION_PACKAGE_VISIBILITY = ["//:extension_library"] +CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//:contrib_library"]