Make protobuf codebase compatible with --incompatible_config_setting_private_default_visibility (#22745)

Adam Cozzette · web-flow · commit 5e2838e59874 · 2025-07-23T17:03:36.000-07:00
This is necessary to get the BCR presubmit checks to pass.

PiperOrigin-RevId: 786432944
diff --git a/ci/common.bazelrc b/ci/common.bazelrc
@@ -44,6 +44,7 @@ build --remote_download_outputs=all
 # running bazelisk with the --migrate flag and filtering out all flags that
 # default to true or are deprecated.
 build --incompatible_check_sharding_support
+build --incompatible_config_setting_private_default_visibility
 build --incompatible_default_to_explicit_init_py
 build --incompatible_disable_native_android_rules
 build --incompatible_disable_target_provider_fields
@@ -59,7 +60,6 @@ build --incompatible_use_cc_configure_from_rules_cc
 
 # We cannot yet build successfully with the following flags:
 #   --incompatible_check_testonly_for_output_files
-#   --incompatible_config_setting_private_default_visibility
 #   --incompatible_disable_starlark_host_transitions
 #   --incompatible_disallow_struct_provider_syntax
 #   --incompatible_no_implicit_file_export
@@ -82,4 +82,4 @@ build --verbose_failures
 # check.
 build --features=layering_check
 
-build --enable_platform_specific_config
+build --enable_platform_specific_config
diff --git a/python/dist/BUILD.bazel b/python/dist/BUILD.bazel
@@ -130,6 +130,7 @@ selects.config_setting_group(
         ":osx_x86_64_release",
         ":osx_x86_64_local",
     ],
+    visibility = ["//python:__subpackages__"],
 )
 
 config_setting(
@@ -157,6 +158,7 @@ selects.config_setting_group(
         ":osx_aarch64_release",
         ":osx_aarch64_local",
     ],
+    visibility = ["//python:__subpackages__"],
 )
 
 config_setting(
@@ -189,6 +191,7 @@ selects.config_setting_group(
         ":windows_x86_32_release",
         ":windows_x86_32_local",
     ],
+    visibility = ["//python:__subpackages__"],
 )
 
 config_setting(
diff --git a/ruby/BUILD.bazel b/ruby/BUILD.bazel
@@ -29,13 +29,15 @@ config_setting(
     flag_values = {
         ":ffi": "enabled",
     },
+    visibility = ["//ruby:__subpackages__"],
 )
 
 config_setting(
     name = "ffi_disabled",
     flag_values = {
         ":ffi": "disabled",
     },
+    visibility = ["//ruby:__subpackages__"],
 )
 
 selects.config_setting_group(
@@ -76,6 +78,7 @@ selects.config_setting_group(
         ":ffi_enabled",
         "@platforms//os:osx",
     ],
+    visibility = ["//ruby:__subpackages__"],
 )
 
 selects.config_setting_group(
@@ -84,6 +87,7 @@ selects.config_setting_group(
         ":ffi_enabled",
         "@platforms//os:linux",
     ],
+    visibility = ["//ruby:__subpackages__"],
 )
 
 internal_copy_files(
diff --git a/upb/BUILD b/upb/BUILD
@@ -28,6 +28,12 @@ exports_files(
 config_setting(
     name = "windows",
     constraint_values = ["@platforms//os:windows"],
+    visibility = [
+        "//lua:__pkg__",
+        "//python:__pkg__",
+        "//upb:__subpackages__",
+        "//upb_generator:__subpackages__",
+    ],
 )
 
 bool_flag(
@@ -39,6 +45,12 @@ bool_flag(
 config_setting(
     name = "fasttable_enabled_setting",
     flag_values = {"//upb:fasttable_enabled": "true"},
+    visibility = [
+        "//lua:__pkg__",
+        "//python:__pkg__",
+        "//upb:__subpackages__",
+        "//upb_generator:__subpackages__",
+    ],
 )
 
 upb_proto_library_copts(
