Skip to content

Commit 62e7a56

Browse files
author
Adam Cozzette
authored
Add missing alias targets for C++ util libraries (#15783)
Until recently, these targets were dependencies of `//:protobuf` and could thus be accessed through that target. But now that we are adhering to the layering check, we need to provide proper access in a way that respects that check. This change uses top-level alias targets following the existing pattern. PiperOrigin-RevId: 605123979
1 parent 777d29e commit 62e7a56

5 files changed

Lines changed: 48 additions & 12 deletions

File tree

‎BUILD.bazel‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,42 @@ alias(
295295
visibility = ["//visibility:public"],
296296
)
297297

298+
alias(
299+
name = "delimited_message_util",
300+
actual = "//src/google/protobuf/util:delimited_message_util",
301+
visibility = ["//visibility:public"],
302+
)
303+
304+
alias(
305+
name = "differencer",
306+
actual = "//src/google/protobuf/util:differencer",
307+
visibility = ["//visibility:public"],
308+
)
309+
310+
alias(
311+
name = "field_mask_util",
312+
actual = "//src/google/protobuf/util:field_mask_util",
313+
visibility = ["//visibility:public"],
314+
)
315+
316+
alias(
317+
name = "json_util",
318+
actual = "//src/google/protobuf/util:json_util",
319+
visibility = ["//visibility:public"],
320+
)
321+
322+
alias(
323+
name = "time_util",
324+
actual = "//src/google/protobuf/util:time_util",
325+
visibility = ["//visibility:public"],
326+
)
327+
328+
alias(
329+
name = "type_resolver",
330+
actual = "//src/google/protobuf/util:type_resolver",
331+
visibility = ["//visibility:public"],
332+
)
333+
298334
################################################################################
299335
# Java support
300336
################################################################################

‎conformance/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ cc_library(
149149
"//src/google/protobuf:protobuf_lite",
150150
"//src/google/protobuf/util:differencer",
151151
"//src/google/protobuf/util:json_util",
152-
"//src/google/protobuf/util:type_resolver_util",
152+
"//src/google/protobuf/util:type_resolver",
153153
"@com_google_absl//absl/container:btree",
154154
"@com_google_absl//absl/container:flat_hash_set",
155155
"@com_google_absl//absl/log:absl_check",
@@ -174,7 +174,7 @@ cc_library(
174174
"//src/google/protobuf/editions:test_messages_proto2_editions_cc_proto",
175175
"//src/google/protobuf/editions:test_messages_proto3_editions_cc_proto",
176176
"//src/google/protobuf/json",
177-
"//src/google/protobuf/util:type_resolver_util",
177+
"//src/google/protobuf/util:type_resolver",
178178
"@com_google_absl//absl/log:absl_check",
179179
"@com_google_absl//absl/log:absl_log",
180180
"@com_google_absl//absl/log:die_if_null",
@@ -232,7 +232,7 @@ cc_binary(
232232
"//src/google/protobuf/editions:test_messages_proto3_editions_cc_proto",
233233
"//src/google/protobuf/stubs",
234234
"//src/google/protobuf/util:json_util",
235-
"//src/google/protobuf/util:type_resolver_util",
235+
"//src/google/protobuf/util:type_resolver",
236236
"@com_google_absl//absl/log:absl_check",
237237
"@com_google_absl//absl/log:absl_log",
238238
"@com_google_absl//absl/status",

‎pkg/BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ cc_dist_library(
173173
"//src/google/protobuf/util:field_mask_util",
174174
"//src/google/protobuf/util:json_util",
175175
"//src/google/protobuf/util:time_util",
176-
"//src/google/protobuf/util:type_resolver_util",
176+
"//src/google/protobuf/util:type_resolver",
177177
],
178178
)
179179

‎src/google/protobuf/json/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cc_library(
2525
"//src/google/protobuf/io",
2626
"//src/google/protobuf/io:zero_copy_sink",
2727
"//src/google/protobuf/stubs",
28-
"//src/google/protobuf/util:type_resolver_util",
28+
"//src/google/protobuf/util:type_resolver",
2929
"@com_google_absl//absl/base",
3030
"@com_google_absl//absl/flags:flag",
3131
"@com_google_absl//absl/log:absl_log",
@@ -53,7 +53,7 @@ cc_test(
5353
"//src/google/protobuf/stubs",
5454
"//src/google/protobuf/util:json_format_cc_proto",
5555
"//src/google/protobuf/util:json_format_proto3_cc_proto",
56-
"//src/google/protobuf/util:type_resolver_util",
56+
"//src/google/protobuf/util:type_resolver",
5757
"@com_google_absl//absl/flags:flag",
5858
"@com_google_absl//absl/status",
5959
"@com_google_absl//absl/status:statusor",
@@ -110,7 +110,7 @@ cc_library(
110110
"//src/google/protobuf:type_cc_proto",
111111
"//src/google/protobuf/io",
112112
"//src/google/protobuf/stubs",
113-
"//src/google/protobuf/util:type_resolver_util",
113+
"//src/google/protobuf/util:type_resolver",
114114
"//third_party/utf8_range:utf8_validity",
115115
"@com_google_absl//absl/container:flat_hash_map",
116116
"@com_google_absl//absl/log:absl_check",
@@ -199,7 +199,7 @@ cc_library(
199199
":untyped_message",
200200
"//src/google/protobuf",
201201
"//src/google/protobuf:port",
202-
"//src/google/protobuf/util:type_resolver_util",
202+
"//src/google/protobuf/util:type_resolver",
203203
"@com_google_absl//absl/algorithm:container",
204204
"@com_google_absl//absl/status",
205205
"@com_google_absl//absl/status:statusor",
@@ -230,7 +230,7 @@ cc_library(
230230
"//src/google/protobuf/io",
231231
"//src/google/protobuf/io:zero_copy_sink",
232232
"//src/google/protobuf/stubs",
233-
"//src/google/protobuf/util:type_resolver_util",
233+
"//src/google/protobuf/util:type_resolver",
234234
"@com_google_absl//absl/base",
235235
"@com_google_absl//absl/base:core_headers",
236236
"@com_google_absl//absl/container:flat_hash_map",
@@ -266,7 +266,7 @@ cc_library(
266266
"//src/google/protobuf:type_cc_proto",
267267
"//src/google/protobuf/io",
268268
"//src/google/protobuf/stubs",
269-
"//src/google/protobuf/util:type_resolver_util",
269+
"//src/google/protobuf/util:type_resolver",
270270
"@com_google_absl//absl/container:flat_hash_map",
271271
"@com_google_absl//absl/log:absl_check",
272272
"@com_google_absl//absl/log:absl_log",

‎src/google/protobuf/util/BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ cc_test(
195195
)
196196

197197
cc_library(
198-
name = "type_resolver_util",
198+
name = "type_resolver",
199199
srcs = ["type_resolver_util.cc"],
200200
hdrs = [
201201
"type_resolver.h",
@@ -228,7 +228,7 @@ cc_test(
228228
":json_format_cc_proto",
229229
":json_format_proto3_cc_proto",
230230
":json_util",
231-
":type_resolver_util",
231+
":type_resolver",
232232
"//src/google/protobuf",
233233
"//src/google/protobuf:any_cc_proto",
234234
"//src/google/protobuf:cc_test_protos",

0 commit comments

Comments
 (0)