diff --git a/cel_android_rules.bzl b/cel_android_rules.bzl index 694fdf31d..5a94a7ef5 100644 --- a/cel_android_rules.bzl +++ b/cel_android_rules.bzl @@ -31,10 +31,15 @@ def cel_android_library(name, **kwargs): javacopts = kwargs.get("javacopts", []) all_javacopts = DEFAULT_JAVACOPTS + javacopts + # By default, set visibility to android_allow_list, unless if overridden at the call site. + provided_visibility_or_default = kwargs.get("visibility", ["//:android_allow_list"]) + filtered_kwargs = {k: v for k, v in kwargs.items() if k != "visibility"} + android_library( name = name, + visibility = provided_visibility_or_default, javacopts = all_javacopts, - **kwargs + **filtered_kwargs ) def cel_android_local_test(name, **kwargs): diff --git a/common/BUILD.bazel b/common/BUILD.bazel index 478416d32..a7cdefda8 100644 --- a/common/BUILD.bazel +++ b/common/BUILD.bazel @@ -24,7 +24,6 @@ java_library( cel_android_library( name = "proto_ast_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common:proto_ast_android"], ) @@ -80,7 +79,6 @@ java_library( cel_android_library( name = "cel_source_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common:cel_source_android"], ) @@ -91,7 +89,6 @@ java_library( cel_android_library( name = "cel_ast_android", - visibility = ["//:android_allow_list"], exports = [ "//common/src/main/java/dev/cel/common:cel_ast_android", ], diff --git a/common/ast/BUILD.bazel b/common/ast/BUILD.bazel index 60f519214..276db0322 100644 --- a/common/ast/BUILD.bazel +++ b/common/ast/BUILD.bazel @@ -13,7 +13,6 @@ java_library( cel_android_library( name = "ast_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"], ) @@ -24,7 +23,6 @@ java_library( cel_android_library( name = "expr_converter_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/ast:expr_converter_android"], ) diff --git a/common/internal/BUILD.bazel b/common/internal/BUILD.bazel index 63bff51d9..b0c9607ab 100644 --- a/common/internal/BUILD.bazel +++ b/common/internal/BUILD.bazel @@ -95,6 +95,5 @@ java_library( cel_android_library( name = "internal_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"], ) diff --git a/common/types/BUILD.bazel b/common/types/BUILD.bazel index 9961fe40c..6c2b1a269 100644 --- a/common/types/BUILD.bazel +++ b/common/types/BUILD.bazel @@ -58,24 +58,20 @@ java_library( cel_android_library( name = "cel_types_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/types:cel_types_android"], ) cel_android_library( name = "types_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/types:types_android"], ) cel_android_library( name = "type_providers_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/types:type_providers_android"], ) cel_android_library( name = "cel_proto_types_android", - visibility = ["//:android_allow_list"], exports = ["//common/src/main/java/dev/cel/common/types:cel_proto_types_android"], ) diff --git a/runtime/BUILD.bazel b/runtime/BUILD.bazel index bf096c84e..b27d27020 100644 --- a/runtime/BUILD.bazel +++ b/runtime/BUILD.bazel @@ -58,7 +58,6 @@ java_library( cel_android_library( name = "function_binding_android", - visibility = ["//:android_allow_list"], exports = [ "//runtime/src/main/java/dev/cel/runtime:function_binding_android", ], @@ -170,13 +169,11 @@ cel_android_library( cel_android_library( name = "lite_runtime_android", - visibility = ["//:android_allow_list"], exports = ["//runtime/src/main/java/dev/cel/runtime:lite_runtime_android"], ) cel_android_library( name = "lite_runtime_factory_android", - visibility = ["//:android_allow_list"], exports = ["//runtime/src/main/java/dev/cel/runtime:lite_runtime_factory_android"], )