diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl index 8bd4401f74028..59928e7e589e7 100644 --- a/bazel/envoy_build_system.bzl +++ b/bazel/envoy_build_system.bzl @@ -48,6 +48,7 @@ load( "@envoy_build_config//:extensions_build_config.bzl", "CONTRIB_EXTENSION_PACKAGE_VISIBILITY", "EXTENSION_PACKAGE_VISIBILITY", + "MOBILE_PACKAGE_VISIBILITY", ) load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") @@ -68,7 +69,9 @@ def envoy_extension_package(enabled_default = True, default_visibility = EXTENSI ) def envoy_mobile_package(): - envoy_extension_package() + # Mobile packages should only be visible to other mobile packages, not any other + # parts of the Envoy codebase. + envoy_extension_package(default_visibility = MOBILE_PACKAGE_VISIBILITY) def envoy_contrib_package(): envoy_extension_package(default_visibility = CONTRIB_EXTENSION_PACKAGE_VISIBILITY) diff --git a/ci/osx-build-config/extensions_build_config.bzl b/ci/osx-build-config/extensions_build_config.bzl index d0ff8fdfacf9e..79a960e73132c 100644 --- a/ci/osx-build-config/extensions_build_config.bzl +++ b/ci/osx-build-config/extensions_build_config.bzl @@ -17,6 +17,7 @@ WINDOWS_EXTENSIONS = {} EXTENSION_CONFIG_VISIBILITY = ["//:extension_config"] EXTENSION_PACKAGE_VISIBILITY = ["//:extension_library"] CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//:contrib_library"] +MOBILE_PACKAGE_VISIBILITY = ["//:mobile_library"] # As part of (https://github.com/envoyproxy/envoy-mobile/issues/175) we turned down alwayslink for envoy libraries # This tracks libraries that should be registered as extensions. diff --git a/source/extensions/extensions_build_config.bzl b/source/extensions/extensions_build_config.bzl index 56519a62d018b..f7fb6f92ceaa9 100644 --- a/source/extensions/extensions_build_config.bzl +++ b/source/extensions/extensions_build_config.bzl @@ -381,6 +381,7 @@ EXTENSIONS = { EXTENSION_CONFIG_VISIBILITY = ["//:extension_config", "//:contrib_library", "//:examples_library", "//:mobile_library"] EXTENSION_PACKAGE_VISIBILITY = ["//:extension_library", "//:contrib_library", "//:examples_library", "//:mobile_library"] CONTRIB_EXTENSION_PACKAGE_VISIBILITY = ["//:contrib_library"] +MOBILE_PACKAGE_VISIBILITY = ["//:mobile_library"] # Set this variable to true to disable alwayslink for envoy_cc_library. # TODO(alyssawilk) audit uses of this in source/ and migrate all libraries to extensions.