Skip to content

Commit 02f2fed

Browse files
l46kokcopybara-github
authored andcommitted
Internal Changes
PiperOrigin-RevId: 922234977
1 parent 8c9bb8f commit 02f2fed

19 files changed

Lines changed: 4 additions & 199 deletions

File tree

cel_android_rules.bzl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ def cel_android_library(name, **kwargs):
3333

3434
# By default, set visibility to android_allow_list, unless if overridden at the call site.
3535
provided_visibility_or_default = kwargs.get("visibility", ["//:android_allow_list"])
36-
filtered_kwargs = {k: v for k, v in kwargs.items() if k != "visibility"}
36+
provided_compatible_with_or_default = kwargs.get("compatible_with", [])
37+
filtered_kwargs = {k: v for k, v in kwargs.items() if k not in ["visibility", "compatible_with"]}
3738

3839
android_library(
3940
name = name,
4041
visibility = provided_visibility_or_default,
42+
compatible_with = provided_compatible_with_or_default,
4143
javacopts = all_javacopts,
4244
**filtered_kwargs
4345
)

common/BUILD.bazel

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ java_library(
2929

3030
cel_android_library(
3131
name = "proto_ast_android",
32-
compatible_with = [],
3332
exports = ["//common/src/main/java/dev/cel/common:proto_ast_android"],
3433
)
3534

@@ -77,7 +76,6 @@ java_library(
7776

7877
cel_android_library(
7978
name = "cel_source_android",
80-
compatible_with = [],
8179
exports = ["//common/src/main/java/dev/cel/common:cel_source_android"],
8280
)
8381

@@ -94,7 +92,6 @@ java_library(
9492

9593
cel_android_library(
9694
name = "cel_ast_android",
97-
compatible_with = [],
9895
exports = [
9996
"//common/src/main/java/dev/cel/common:cel_ast_android",
10097
],
@@ -128,6 +125,5 @@ java_library(
128125

129126
cel_android_library(
130127
name = "operator_android",
131-
compatible_with = [],
132128
exports = ["//common/src/main/java/dev/cel/common:operator_android"],
133129
)

common/ast/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ java_library(
1313

1414
cel_android_library(
1515
name = "ast_android",
16-
compatible_with = [],
1716
exports = ["//common/src/main/java/dev/cel/common/ast:ast_android"],
1817
)
1918

@@ -24,7 +23,6 @@ java_library(
2423

2524
cel_android_library(
2625
name = "expr_converter_android",
27-
compatible_with = [],
2826
exports = ["//common/src/main/java/dev/cel/common/ast:expr_converter_android"],
2927
)
3028

common/internal/BUILD.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ java_library(
2323

2424
cel_android_library(
2525
name = "comparison_functions_android",
26-
compatible_with = [],
2726
exports = ["//common/src/main/java/dev/cel/common/internal:comparison_functions_android"],
2827
)
2928

@@ -80,7 +79,6 @@ java_library(
8079

8180
cel_android_library(
8281
name = "well_known_proto_android",
83-
compatible_with = [],
8482
exports = ["//common/src/main/java/dev/cel/common/internal:well_known_proto_android"],
8583
)
8684

@@ -106,7 +104,6 @@ java_library(
106104

107105
cel_android_library(
108106
name = "cel_lite_descriptor_pool_android",
109-
compatible_with = [],
110107
exports = ["//common/src/main/java/dev/cel/common/internal:cel_lite_descriptor_pool_android"],
111108
)
112109

@@ -117,7 +114,6 @@ java_library(
117114

118115
cel_android_library(
119116
name = "default_lite_descriptor_pool_android",
120-
compatible_with = [],
121117
exports = ["//common/src/main/java/dev/cel/common/internal:default_lite_descriptor_pool_android"],
122118
)
123119

@@ -129,7 +125,6 @@ java_library(
129125

130126
cel_android_library(
131127
name = "internal_android",
132-
compatible_with = [],
133128
exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
134129
)
135130

@@ -140,7 +135,6 @@ java_library(
140135

141136
cel_android_library(
142137
name = "proto_time_utils_android",
143-
compatible_with = [],
144138
exports = ["//common/src/main/java/dev/cel/common/internal:proto_time_utils_android"],
145139
)
146140

@@ -151,7 +145,6 @@ java_library(
151145

152146
cel_android_library(
153147
name = "date_time_helpers_android",
154-
compatible_with = [],
155148
exports = ["//common/src/main/java/dev/cel/common/internal:date_time_helpers_android"],
156149
)
157150

common/src/main/java/dev/cel/common/BUILD.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ java_library(
133133
cel_android_library(
134134
name = "proto_ast_android",
135135
srcs = PROTO_AST_SOURCE,
136-
compatible_with = [],
137136
tags = [
138137
],
139138
deps = [
@@ -248,7 +247,6 @@ java_library(
248247
cel_android_library(
249248
name = "cel_source_android",
250249
srcs = ["CelSource.java"],
251-
compatible_with = [],
252250
tags = [
253251
],
254252
deps = [
@@ -279,7 +277,6 @@ java_library(
279277
cel_android_library(
280278
name = "cel_source_helper_android",
281279
srcs = ["CelSourceHelper.java"],
282-
compatible_with = [],
283280
deps = [
284281
":source_location_android",
285282
"//common/annotations",
@@ -308,7 +305,6 @@ java_library(
308305
cel_android_library(
309306
name = "cel_ast_android",
310307
srcs = ["CelAbstractSyntaxTree.java"],
311-
compatible_with = [],
312308
tags = [
313309
],
314310
deps = [
@@ -338,7 +334,6 @@ java_library(
338334
cel_android_library(
339335
name = "source_android",
340336
srcs = SOURCE_SOURCES,
341-
compatible_with = [],
342337
visibility = ["//visibility:private"],
343338
deps = [
344339
"//common/annotations",
@@ -350,7 +345,6 @@ cel_android_library(
350345
cel_android_library(
351346
name = "source_location_android",
352347
srcs = ["CelSourceLocation.java"],
353-
compatible_with = [],
354348
visibility = ["//visibility:private"],
355349
deps = [
356350
"//:auto_value",
@@ -382,7 +376,6 @@ java_library(
382376
cel_android_library(
383377
name = "operator_android",
384378
srcs = ["Operator.java"],
385-
compatible_with = [],
386379
tags = [
387380
],
388381
deps = ["@maven_android//:com_google_guava_guava"],

common/src/main/java/dev/cel/common/ast/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ java_library(
7676
cel_android_library(
7777
name = "expr_converter_android",
7878
srcs = EXPR_CONVERTER_SOURCES,
79-
compatible_with = [],
8079
tags = [
8180
],
8281
deps = [
@@ -143,7 +142,6 @@ java_library(
143142
cel_android_library(
144143
name = "ast_android",
145144
srcs = AST_SOURCES,
146-
compatible_with = [],
147145
tags = [
148146
],
149147
deps = [

common/src/main/java/dev/cel/common/internal/BUILD.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ java_library(
6767
cel_android_library(
6868
name = "internal_android",
6969
srcs = INTERNAL_SOURCES,
70-
compatible_with = [],
7170
tags = [
7271
],
7372
deps = [
@@ -99,7 +98,6 @@ java_library(
9998
cel_android_library(
10099
name = "comparison_functions_android",
101100
srcs = ["ComparisonFunctions.java"],
102-
compatible_with = [],
103101
tags = [
104102
],
105103
deps = [
@@ -277,7 +275,6 @@ java_library(
277275
cel_android_library(
278276
name = "well_known_proto_android",
279277
srcs = ["WellKnownProto.java"],
280-
compatible_with = [],
281278
tags = [
282279
],
283280
deps = [
@@ -344,7 +341,6 @@ java_library(
344341
cel_android_library(
345342
name = "cel_lite_descriptor_pool_android",
346343
srcs = ["CelLiteDescriptorPool.java"],
347-
compatible_with = [],
348344
tags = [
349345
],
350346
deps = [
@@ -374,7 +370,6 @@ java_library(
374370
cel_android_library(
375371
name = "default_lite_descriptor_pool_android",
376372
srcs = ["DefaultLiteDescriptorPool.java"],
377-
compatible_with = [],
378373
tags = [
379374
],
380375
deps = [
@@ -427,7 +422,6 @@ java_library(
427422
cel_android_library(
428423
name = "proto_time_utils_android",
429424
srcs = ["ProtoTimeUtils.java"],
430-
compatible_with = [],
431425
tags = [
432426
],
433427
deps = [
@@ -455,7 +449,6 @@ java_library(
455449
cel_android_library(
456450
name = "date_time_helpers_android",
457451
srcs = ["DateTimeHelpers.java"],
458-
compatible_with = [],
459452
tags = [
460453
],
461454
deps = [

common/src/main/java/dev/cel/common/types/BUILD.bazel

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ java_library(
9999
cel_android_library(
100100
name = "cel_proto_types_android",
101101
srcs = ["CelProtoTypes.java"],
102-
compatible_with = [],
103102
tags = [
104103
],
105104
deps = [
@@ -205,7 +204,6 @@ cel_android_library(
205204
srcs = [
206205
"DefaultTypeProvider.java",
207206
],
208-
compatible_with = [],
209207
tags = [
210208
],
211209
deps = [
@@ -219,7 +217,6 @@ cel_android_library(
219217
cel_android_library(
220218
name = "cel_types_android",
221219
srcs = ["CelTypes.java"],
222-
compatible_with = [],
223220
tags = [
224221
],
225222
deps = [
@@ -233,7 +230,6 @@ cel_android_library(
233230
cel_android_library(
234231
name = "type_providers_android",
235232
srcs = CEL_TYPE_PROVIDER_SOURCES,
236-
compatible_with = [],
237233
tags = [
238234
],
239235
deps = [
@@ -245,7 +241,6 @@ cel_android_library(
245241
cel_android_library(
246242
name = "types_android",
247243
srcs = CEL_TYPE_SOURCES,
248-
compatible_with = [],
249244
tags = [
250245
],
251246
deps = [
@@ -260,7 +255,6 @@ cel_android_library(
260255
cel_android_library(
261256
name = "cel_internal_types_android",
262257
srcs = CEL_INTERNAL_TYPE_SOURCES,
263-
compatible_with = [],
264258
deps = [
265259
"//:auto_value",
266260
"//common/annotations",

common/src/main/java/dev/cel/common/values/BUILD.bazel

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ java_library(
4343
cel_android_library(
4444
name = "cel_value_android",
4545
srcs = ["CelValue.java"],
46-
compatible_with = [],
4746
tags = [
4847
],
4948
deps = [
@@ -67,7 +66,6 @@ java_library(
6766
cel_android_library(
6867
name = "cel_value_provider_android",
6968
srcs = ["CelValueProvider.java"],
70-
compatible_with = [],
7169
tags = [
7270
],
7371
deps = [
@@ -97,7 +95,6 @@ cel_android_library(
9795
srcs = [
9896
"CombinedCelValueProvider.java",
9997
],
100-
compatible_with = [],
10198
tags = [
10299
],
103100
deps = [
@@ -129,7 +126,6 @@ cel_android_library(
129126
srcs = [
130127
"CombinedCelValueConverter.java",
131128
],
132-
compatible_with = [],
133129
tags = [
134130
],
135131
deps = [
@@ -155,7 +151,6 @@ cel_android_library(
155151
srcs = [
156152
"CelPreAdaptedList.java",
157153
],
158-
compatible_with = [],
159154
tags = [
160155
],
161156
deps = ["//common/annotations"],
@@ -199,7 +194,6 @@ java_library(
199194
cel_android_library(
200195
name = "mutable_map_value_android",
201196
srcs = ["MutableMapValue.java"],
202-
compatible_with = [],
203197
tags = [
204198
],
205199
deps = [
@@ -216,7 +210,6 @@ cel_android_library(
216210
cel_android_library(
217211
name = "values_android",
218212
srcs = CEL_VALUES_SOURCES,
219-
compatible_with = [],
220213
tags = [
221214
],
222215
deps = [
@@ -264,7 +257,6 @@ java_library(
264257
cel_android_library(
265258
name = "base_proto_cel_value_converter_android",
266259
srcs = ["BaseProtoCelValueConverter.java"],
267-
compatible_with = [],
268260
tags = [
269261
],
270262
deps = [
@@ -351,7 +343,6 @@ cel_android_library(
351343
"ProtoLiteCelValueConverter.java",
352344
"ProtoMessageLiteValue.java",
353345
],
354-
compatible_with = [],
355346
tags = [
356347
],
357348
deps = [
@@ -394,7 +385,6 @@ java_library(
394385
cel_android_library(
395386
name = "proto_message_lite_value_provider_android",
396387
srcs = ["ProtoMessageLiteValueProvider.java"],
397-
compatible_with = [],
398388
tags = [
399389
],
400390
deps = [
@@ -427,7 +417,6 @@ java_library(
427417
cel_android_library(
428418
name = "base_proto_message_value_provider_android",
429419
srcs = ["BaseProtoMessageValueProvider.java"],
430-
compatible_with = [],
431420
tags = [
432421
],
433422
deps = [

0 commit comments

Comments
 (0)