Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cel_android_rules.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ def cel_android_library(name, **kwargs):

# 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"}
provided_compatible_with_or_default = kwargs.get("compatible_with", [])
filtered_kwargs = {k: v for k, v in kwargs.items() if k not in ["visibility", "compatible_with"]}

android_library(
name = name,
visibility = provided_visibility_or_default,
compatible_with = provided_compatible_with_or_default,
javacopts = all_javacopts,
**filtered_kwargs
)
Expand Down
4 changes: 0 additions & 4 deletions common/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ java_library(

cel_android_library(
name = "proto_ast_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common:proto_ast_android"],
)

Expand Down Expand Up @@ -77,7 +76,6 @@ java_library(

cel_android_library(
name = "cel_source_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common:cel_source_android"],
)

Expand All @@ -94,7 +92,6 @@ java_library(

cel_android_library(
name = "cel_ast_android",
compatible_with = [],
exports = [
"//common/src/main/java/dev/cel/common:cel_ast_android",
],
Expand Down Expand Up @@ -128,6 +125,5 @@ java_library(

cel_android_library(
name = "operator_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common:operator_android"],
)
2 changes: 0 additions & 2 deletions common/ast/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ java_library(

cel_android_library(
name = "ast_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
)

Expand All @@ -24,7 +23,6 @@ java_library(

cel_android_library(
name = "expr_converter_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/ast:expr_converter_android"],
)

Expand Down
7 changes: 0 additions & 7 deletions common/internal/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ java_library(

cel_android_library(
name = "comparison_functions_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
)

Expand Down Expand Up @@ -80,7 +79,6 @@ java_library(

cel_android_library(
name = "well_known_proto_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto_android"],
)

Expand All @@ -106,7 +104,6 @@ java_library(

cel_android_library(
name = "cel_lite_descriptor_pool_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool_android"],
)

Expand All @@ -117,7 +114,6 @@ java_library(

cel_android_library(
name = "default_lite_descriptor_pool_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool_android"],
)

Expand All @@ -129,7 +125,6 @@ java_library(

cel_android_library(
name = "internal_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
)

Expand All @@ -140,7 +135,6 @@ java_library(

cel_android_library(
name = "proto_time_utils_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:proto_time_utils_android"],
)

Expand All @@ -151,7 +145,6 @@ java_library(

cel_android_library(
name = "date_time_helpers_android",
compatible_with = [],
exports = ["//common/src/main/java/dev/cel/common/internal:date_time_helpers_android"],
)

Expand Down
7 changes: 0 additions & 7 deletions common/src/main/java/dev/cel/common/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ java_library(
cel_android_library(
name = "proto_ast_android",
srcs = PROTO_AST_SOURCE,
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -248,7 +247,6 @@ java_library(
cel_android_library(
name = "cel_source_android",
srcs = ["CelSource.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -279,7 +277,6 @@ java_library(
cel_android_library(
name = "cel_source_helper_android",
srcs = ["CelSourceHelper.java"],
compatible_with = [],
deps = [
":source_location_android",
"//common/annotations",
Expand Down Expand Up @@ -308,7 +305,6 @@ java_library(
cel_android_library(
name = "cel_ast_android",
srcs = ["CelAbstractSyntaxTree.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -338,7 +334,6 @@ java_library(
cel_android_library(
name = "source_android",
srcs = SOURCE_SOURCES,
compatible_with = [],
visibility = ["//visibility:private"],
deps = [
"//common/annotations",
Expand All @@ -350,7 +345,6 @@ cel_android_library(
cel_android_library(
name = "source_location_android",
srcs = ["CelSourceLocation.java"],
compatible_with = [],
visibility = ["//visibility:private"],
deps = [
"//:auto_value",
Expand Down Expand Up @@ -382,7 +376,6 @@ java_library(
cel_android_library(
name = "operator_android",
srcs = ["Operator.java"],
compatible_with = [],
tags = [
],
deps = ["@maven_android//:com_google_guava_guava"],
Expand Down
2 changes: 0 additions & 2 deletions common/src/main/java/dev/cel/common/ast/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ java_library(
cel_android_library(
name = "expr_converter_android",
srcs = EXPR_CONVERTER_SOURCES,
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -143,7 +142,6 @@ java_library(
cel_android_library(
name = "ast_android",
srcs = AST_SOURCES,
compatible_with = [],
tags = [
],
deps = [
Expand Down
7 changes: 0 additions & 7 deletions common/src/main/java/dev/cel/common/internal/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ java_library(
cel_android_library(
name = "internal_android",
srcs = INTERNAL_SOURCES,
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -99,7 +98,6 @@ java_library(
cel_android_library(
name = "comparison_functions_android",
srcs = ["ComparisonFunctions.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -277,7 +275,6 @@ java_library(
cel_android_library(
name = "well_known_proto_android",
srcs = ["WellKnownProto.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -344,7 +341,6 @@ java_library(
cel_android_library(
name = "cel_lite_descriptor_pool_android",
srcs = ["CelLiteDescriptorPool.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -374,7 +370,6 @@ java_library(
cel_android_library(
name = "default_lite_descriptor_pool_android",
srcs = ["DefaultLiteDescriptorPool.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -427,7 +422,6 @@ java_library(
cel_android_library(
name = "proto_time_utils_android",
srcs = ["ProtoTimeUtils.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -455,7 +449,6 @@ java_library(
cel_android_library(
name = "date_time_helpers_android",
srcs = ["DateTimeHelpers.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down
6 changes: 0 additions & 6 deletions common/src/main/java/dev/cel/common/types/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ java_library(
cel_android_library(
name = "cel_proto_types_android",
srcs = ["CelProtoTypes.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -205,7 +204,6 @@ cel_android_library(
srcs = [
"DefaultTypeProvider.java",
],
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -219,7 +217,6 @@ cel_android_library(
cel_android_library(
name = "cel_types_android",
srcs = ["CelTypes.java"],
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -233,7 +230,6 @@ cel_android_library(
cel_android_library(
name = "type_providers_android",
srcs = CEL_TYPE_PROVIDER_SOURCES,
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -245,7 +241,6 @@ cel_android_library(
cel_android_library(
name = "types_android",
srcs = CEL_TYPE_SOURCES,
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -260,7 +255,6 @@ cel_android_library(
cel_android_library(
name = "cel_internal_types_android",
srcs = CEL_INTERNAL_TYPE_SOURCES,
compatible_with = [],
deps = [
"//:auto_value",
"//common/annotations",
Expand Down
11 changes: 0 additions & 11 deletions common/src/main/java/dev/cel/common/values/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ java_library(
cel_android_library(
name = "cel_value_android",
srcs = ["CelValue.java"],
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -67,7 +66,6 @@ java_library(
cel_android_library(
name = "cel_value_provider_android",
srcs = ["CelValueProvider.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -97,7 +95,6 @@ cel_android_library(
srcs = [
"CombinedCelValueProvider.java",
],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -129,7 +126,6 @@ cel_android_library(
srcs = [
"CombinedCelValueConverter.java",
],
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -155,7 +151,6 @@ cel_android_library(
srcs = [
"CelPreAdaptedList.java",
],
compatible_with = [],
tags = [
],
deps = ["//common/annotations"],
Expand Down Expand Up @@ -199,7 +194,6 @@ java_library(
cel_android_library(
name = "mutable_map_value_android",
srcs = ["MutableMapValue.java"],
compatible_with = [],
tags = [
],
deps = [
Expand All @@ -216,7 +210,6 @@ cel_android_library(
cel_android_library(
name = "values_android",
srcs = CEL_VALUES_SOURCES,
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -264,7 +257,6 @@ java_library(
cel_android_library(
name = "base_proto_cel_value_converter_android",
srcs = ["BaseProtoCelValueConverter.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -351,7 +343,6 @@ cel_android_library(
"ProtoLiteCelValueConverter.java",
"ProtoMessageLiteValue.java",
],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -394,7 +385,6 @@ java_library(
cel_android_library(
name = "proto_message_lite_value_provider_android",
srcs = ["ProtoMessageLiteValueProvider.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down Expand Up @@ -427,7 +417,6 @@ java_library(
cel_android_library(
name = "base_proto_message_value_provider_android",
srcs = ["BaseProtoMessageValueProvider.java"],
compatible_with = [],
tags = [
],
deps = [
Expand Down
Loading
Loading