Strip bzl visibility in `rules_java` on export
PiperOrigin-RevId: 682229230
Change-Id: I8d71c8880b91ecf84f5e628d4108ccfa005e96e3
diff --git a/java/bazel/rules/BUILD.bazel b/java/bazel/rules/BUILD.bazel
index ba3ca91..b82b16c 100644
--- a/java/bazel/rules/BUILD.bazel
+++ b/java/bazel/rules/BUILD.bazel
@@ -22,10 +22,7 @@
bzl_library(
name = "rules",
srcs = glob(["*.bzl"]),
- visibility = [
- "//java:__pkg__",
- "//java/docs:__pkg__",
- ],
+ visibility = ["//visibility:public"], # for Bazel docgen
deps = [
"//java/common",
"//java/common/rules:core_rules",
diff --git a/java/bazel/rules/bazel_java_binary.bzl b/java/bazel/rules/bazel_java_binary.bzl
index 5de7c85..7d0e75b 100644
--- a/java/bazel/rules/bazel_java_binary.bzl
+++ b/java/bazel/rules/bazel_java_binary.bzl
@@ -27,8 +27,6 @@
load("//java/common/rules/impl:java_binary_impl.bzl", "basic_java_binary")
load("//java/common/rules/impl:java_helper.bzl", "helper")
-visibility("//java/docs")
-
def _bazel_java_binary_impl(ctx):
return bazel_base_binary_impl(ctx, is_test_rule_class = False) + helper.executable_providers(ctx)
diff --git a/java/bazel/rules/bazel_java_import.bzl b/java/bazel/rules/bazel_java_import.bzl
index a99b9a6..702dcf9 100644
--- a/java/bazel/rules/bazel_java_import.bzl
+++ b/java/bazel/rules/bazel_java_import.bzl
@@ -21,8 +21,6 @@
load("//java/common/rules:java_import.bzl", "JAVA_IMPORT_ATTRS")
load("//java/common/rules/impl:bazel_java_import_impl.bzl", "bazel_java_import_rule")
-visibility(["//java", "//java/docs"])
-
def _proxy(ctx):
return bazel_java_import_rule(
ctx,
diff --git a/java/bazel/rules/bazel_java_library.bzl b/java/bazel/rules/bazel_java_library.bzl
index e70d54f..425a91a 100644
--- a/java/bazel/rules/bazel_java_library.bzl
+++ b/java/bazel/rules/bazel_java_library.bzl
@@ -22,8 +22,6 @@
load("//java/common/rules:java_library.bzl", "JAVA_LIBRARY_ATTRS")
load("//java/common/rules/impl:bazel_java_library_impl.bzl", "bazel_java_library_rule")
-visibility(["//java/..."])
-
def _proxy(ctx):
return bazel_java_library_rule(
ctx,
diff --git a/java/bazel/rules/bazel_java_plugin.bzl b/java/bazel/rules/bazel_java_plugin.bzl
index 943edd3..b1bfacb 100644
--- a/java/bazel/rules/bazel_java_plugin.bzl
+++ b/java/bazel/rules/bazel_java_plugin.bzl
@@ -24,8 +24,6 @@
load("//java/common/rules:rule_util.bzl", "merge_attrs")
load("//java/common/rules/impl:basic_java_library_impl.bzl", "basic_java_library", "construct_defaultinfo")
-visibility(["//java/..."])
-
def bazel_java_plugin_rule(
ctx,
srcs = [],
diff --git a/java/bazel/rules/bazel_java_test.bzl b/java/bazel/rules/bazel_java_test.bzl
index 8976e2e..7dec849 100644
--- a/java/bazel/rules/bazel_java_test.bzl
+++ b/java/bazel/rules/bazel_java_test.bzl
@@ -19,8 +19,6 @@
load("//java/common/rules/impl:java_helper.bzl", "helper")
load(":bazel_java_binary.bzl", "BASE_BINARY_ATTRS", "bazel_base_binary_impl", "make_binary_rule")
-visibility(["//java", "//java/docs"])
-
def _bazel_java_test_impl(ctx):
return bazel_base_binary_impl(ctx, is_test_rule_class = True) + helper.test_providers(ctx)
diff --git a/java/common/java_semantics.bzl b/java/common/java_semantics.bzl
index d8bf824..c5cb283 100644
--- a/java/common/java_semantics.bzl
+++ b/java/common/java_semantics.bzl
@@ -15,7 +15,7 @@
load("@rules_cc//cc/common:cc_helper.bzl", "cc_helper")
-visibility(["//java/..."])
+# copybara: default visibility
def _find_java_toolchain(ctx):
return ctx.toolchains["@bazel_tools//tools/jdk:toolchain_type"].java
diff --git a/java/common/rules/android_lint.bzl b/java/common/rules/android_lint.bzl
index 7fd8d43..d7fec44 100644
--- a/java/common/rules/android_lint.bzl
+++ b/java/common/rules/android_lint.bzl
@@ -16,7 +16,7 @@
load("//java/common:java_semantics.bzl", "semantics", _semantics_tokenize_javacopts = "tokenize_javacopts")
-visibility(["//java/..."])
+# copybara: default visibility
def _tokenize_opts(opts_depset):
opts = reversed(opts_depset.to_list())
diff --git a/java/common/rules/impl/bazel_java_import_impl.bzl b/java/common/rules/impl/bazel_java_import_impl.bzl
index 1c84fb7..6d636dc 100644
--- a/java/common/rules/impl/bazel_java_import_impl.bzl
+++ b/java/common/rules/impl/bazel_java_import_impl.bzl
@@ -24,7 +24,7 @@
load("//java/common/rules/impl:import_deps_check.bzl", "import_deps_check")
load(":proguard_validation.bzl", "validate_proguard_specs")
-visibility(["//java/..."])
+# copybara: default visibility
_java_common_internal = java_common.internal_DO_NOT_USE()
_run_ijar_private_for_builtins = _java_common_internal.run_ijar_private_for_builtins
diff --git a/java/common/rules/impl/bazel_java_library_impl.bzl b/java/common/rules/impl/bazel_java_library_impl.bzl
index f0a2274..04a020e 100644
--- a/java/common/rules/impl/bazel_java_library_impl.bzl
+++ b/java/common/rules/impl/bazel_java_library_impl.bzl
@@ -18,7 +18,7 @@
load("//java/common/rules/impl:basic_java_library_impl.bzl", "basic_java_library", "construct_defaultinfo")
-visibility(["//java/..."])
+# copybara: default visibility
def bazel_java_library_rule(
ctx,
diff --git a/java/common/rules/impl/java_binary_deploy_jar.bzl b/java/common/rules/impl/java_binary_deploy_jar.bzl
index dd24456..6df08cb 100644
--- a/java/common/rules/impl/java_binary_deploy_jar.bzl
+++ b/java/common/rules/impl/java_binary_deploy_jar.bzl
@@ -17,7 +17,7 @@
load("//java/common:java_semantics.bzl", "semantics")
load(":java_helper.bzl", "helper")
-visibility(["//java/..."])
+# copybara: default visibility
def _get_build_info(ctx, stamp):
if helper.is_stamping_enabled(ctx, stamp):
diff --git a/java/common/rules/impl/java_binary_impl.bzl b/java/common/rules/impl/java_binary_impl.bzl
index 8d7e2ef..98b388b 100644
--- a/java/common/rules/impl/java_binary_impl.bzl
+++ b/java/common/rules/impl/java_binary_impl.bzl
@@ -24,7 +24,7 @@
load(":java_binary_deploy_jar.bzl", "create_deploy_archive")
load(":java_helper.bzl", "helper")
-visibility(["//java/..."])
+# copybara: default visibility
_java_common_internal = java_common.internal_DO_NOT_USE()
JavaCompilationInfo = _java_common_internal.JavaCompilationInfo
diff --git a/java/common/rules/impl/java_helper.bzl b/java/common/rules/impl/java_helper.bzl
index c819075..87465f0 100644
--- a/java/common/rules/impl/java_helper.bzl
+++ b/java/common/rules/impl/java_helper.bzl
@@ -20,7 +20,7 @@
load("@rules_cc//cc/common:cc_helper.bzl", "cc_helper")
load("//java/common:java_semantics.bzl", "semantics")
-visibility(["//java/..."])
+# copybara: default visibility
def _collect_all_targets_as_deps(ctx, classpath_type = "all"):
deps = []
diff --git a/java/common/rules/java_binary.bzl b/java/common/rules/java_binary.bzl
index 5bdcd48..5b8b107 100644
--- a/java/common/rules/java_binary.bzl
+++ b/java/common/rules/java_binary.bzl
@@ -23,7 +23,7 @@
load(":basic_java_library.bzl", "BASIC_JAVA_LIBRARY_IMPLICIT_ATTRS")
load(":rule_util.bzl", "merge_attrs")
-visibility(["//java/..."])
+# copybara: default visibility
BootClassPathInfo = java_common.BootClassPathInfo
diff --git a/java/common/rules/java_binary_wrapper.bzl b/java/common/rules/java_binary_wrapper.bzl
index 3d94dcd..89b423b 100644
--- a/java/common/rules/java_binary_wrapper.bzl
+++ b/java/common/rules/java_binary_wrapper.bzl
@@ -20,7 +20,7 @@
load("//java/common:java_semantics.bzl", "semantics")
-visibility(["//java/..."])
+# copybara: default visibility
def register_legacy_java_binary_rules(
rule_exec,
diff --git a/java/common/rules/java_import.bzl b/java/common/rules/java_import.bzl
index eb8f09e..029f0ab 100644
--- a/java/common/rules/java_import.bzl
+++ b/java/common/rules/java_import.bzl
@@ -19,7 +19,7 @@
load("//java/common:java_info.bzl", "JavaInfo")
load("//java/common:java_semantics.bzl", "semantics")
-visibility(["//java/..."])
+# copybara: default visibility
_ALLOWED_RULES_IN_DEPS_FOR_JAVA_IMPORT = [
"java_library",
diff --git a/java/common/rules/java_library.bzl b/java/common/rules/java_library.bzl
index 8cf012f..9c04fe7 100644
--- a/java/common/rules/java_library.bzl
+++ b/java/common/rules/java_library.bzl
@@ -23,7 +23,7 @@
load(":basic_java_library.bzl", "BASIC_JAVA_LIBRARY_IMPLICIT_ATTRS")
load(":rule_util.bzl", "merge_attrs")
-visibility(["//java/..."])
+# copybara: default visibility
BootClassPathInfo = java_common.BootClassPathInfo
diff --git a/java/common/rules/java_package_configuration.bzl b/java/common/rules/java_package_configuration.bzl
index 1f766d0..7783e0d 100644
--- a/java/common/rules/java_package_configuration.bzl
+++ b/java/common/rules/java_package_configuration.bzl
@@ -17,7 +17,7 @@
load("//java/common:java_common.bzl", "java_common")
load("//java/common/rules/impl:java_helper.bzl", "helper")
-visibility(["//java/..."])
+# copybara: default visibility
_java_common_internal = java_common.internal_DO_NOT_USE()
diff --git a/java/common/rules/java_plugin.bzl b/java/common/rules/java_plugin.bzl
index 571fdff..5b2cc93 100644
--- a/java/common/rules/java_plugin.bzl
+++ b/java/common/rules/java_plugin.bzl
@@ -19,7 +19,7 @@
load(":java_library.bzl", "JAVA_LIBRARY_ATTRS")
load(":rule_util.bzl", "merge_attrs")
-visibility(["//java/..."])
+# copybara: default visibility
JAVA_PLUGIN_ATTRS = merge_attrs(
JAVA_LIBRARY_ATTRS,
diff --git a/java/common/rules/java_runtime.bzl b/java/common/rules/java_runtime.bzl
index 43cb7c6..602819b 100644
--- a/java/common/rules/java_runtime.bzl
+++ b/java/common/rules/java_runtime.bzl
@@ -21,7 +21,7 @@
load("//java/common:java_semantics.bzl", "PLATFORMS_ROOT")
load("//java/common/rules/impl:java_helper.bzl", "helper")
-visibility(["//java/..."])
+# copybara: default visibility
ToolchainInfo = platform_common.ToolchainInfo
diff --git a/java/common/rules/java_toolchain.bzl b/java/common/rules/java_toolchain.bzl
index 1875e33..d59fd62 100644
--- a/java/common/rules/java_toolchain.bzl
+++ b/java/common/rules/java_toolchain.bzl
@@ -21,7 +21,7 @@
load(":java_package_configuration.bzl", "JavaPackageConfigurationInfo")
load(":java_runtime.bzl", "JavaRuntimeInfo")
-visibility(["//java/..."])
+# copybara: default visibility
_java_common_internal = java_common.internal_DO_NOT_USE()
ToolchainInfo = platform_common.ToolchainInfo
diff --git a/java/common/rules/rule_util.bzl b/java/common/rules/rule_util.bzl
index 2b1423a..dc62252 100644
--- a/java/common/rules/rule_util.bzl
+++ b/java/common/rules/rule_util.bzl
@@ -13,7 +13,7 @@
# limitations under the License.
"""Defines rule utilities."""
-visibility(["//java/..."])
+# copybara: default visibility
def merge_attrs(*attribute_dicts, override_attrs = {}, remove_attrs = []):
"""Merges attributes together.
