From 0eac807f3b40357fe09f8d41989a70b873fd4702 Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Thu, 28 Dec 2023 10:38:18 -0800 Subject: [PATCH] upb: delete the aliases for base:internal and mini_descriptor:internal PiperOrigin-RevId: 594280505 --- benchmarks/BUILD | 2 +- upb/BUILD | 24 ++++++------------------ upb/hash/BUILD | 2 +- upb/message/BUILD | 6 +++--- upb/mini_descriptor/BUILD | 4 ++-- upb/reflection/BUILD | 4 ++-- 6 files changed, 15 insertions(+), 27 deletions(-) diff --git a/benchmarks/BUILD b/benchmarks/BUILD index 108eab493f8a..3559926d51bd 100644 --- a/benchmarks/BUILD +++ b/benchmarks/BUILD @@ -78,10 +78,10 @@ cc_test( "//:protobuf", "@com_google_googletest//:gtest_main", "//upb:base", - "//upb:base_internal", "//upb:descriptor_upb_proto", "//upb:mem", "//upb:reflection", + "//upb/base:internal", "@com_github_google_benchmark//:benchmark_main", "@com_google_absl//absl/container:flat_hash_set", ], diff --git a/upb/BUILD b/upb/BUILD index ff7ff72c4920..e6cdff77dd99 100644 --- a/upb/BUILD +++ b/upb/BUILD @@ -137,12 +137,6 @@ alias( visibility = ["//visibility:public"], ) -alias( - name = "base_internal", - actual = "//upb/base:internal", - visibility = ["//visibility:public"], -) - alias( name = "collections", actual = "//upb/collections", @@ -258,12 +252,6 @@ alias( visibility = ["//visibility:public"], ) -alias( - name = "mini_descriptor_internal", - actual = "//upb/mini_descriptor:internal", - visibility = ["//upb:__subpackages__"], -) - alias( name = "mini_table", actual = "//upb/mini_table", @@ -358,7 +346,6 @@ upb_amalgamation( ], libs = [ ":base", - ":base_internal", ":descriptor_upb_minitable_proto", ":descriptor_upb_proto", ":eps_copy_input_stream", @@ -374,7 +361,6 @@ upb_amalgamation( ":message_types", ":message_value", ":mini_descriptor", - ":mini_descriptor_internal", ":mini_table", ":mini_table_compat", ":port", @@ -382,7 +368,9 @@ upb_amalgamation( ":reflection_internal", ":wire", ":wire_reader", + "//upb/base:internal", "//upb/mem:internal", + "//upb/mini_descriptor:internal", "//upb/mini_table:internal", ], strip_import_prefix = ["src"], @@ -404,7 +392,6 @@ upb_amalgamation( ], libs = [ ":base", - ":base_internal", ":descriptor_upb_minitable_proto", ":descriptor_upb_proto_reflection", ":descriptor_upb_proto", @@ -422,7 +409,6 @@ upb_amalgamation( ":message_types", ":message_value", ":mini_descriptor", - ":mini_descriptor_internal", ":mini_table", ":mini_table_compat", ":port", @@ -430,7 +416,9 @@ upb_amalgamation( ":reflection_internal", ":wire", ":wire_reader", + "//upb/base:internal", "//upb/mem:internal", + "//upb/mini_descriptor:internal", "//upb/mini_table:internal", ], prefix = "php-", @@ -454,7 +442,6 @@ upb_amalgamation( ], libs = [ ":base", - ":base_internal", ":descriptor_upb_minitable_proto", ":descriptor_upb_proto", ":eps_copy_input_stream", @@ -471,7 +458,6 @@ upb_amalgamation( ":message_types", ":message_value", ":mini_descriptor", - ":mini_descriptor_internal", ":mini_table", ":mini_table_compat", ":port", @@ -479,7 +465,9 @@ upb_amalgamation( ":reflection_internal", ":wire", ":wire_reader", + "//upb/base:internal", "//upb/mem:internal", + "//upb/mini_descriptor:internal", "//upb/mini_table:internal", ], prefix = "ruby-", diff --git a/upb/hash/BUILD b/upb/hash/BUILD index c7e4ea6b4225..7ef3bd7e0d7a 100644 --- a/upb/hash/BUILD +++ b/upb/hash/BUILD @@ -21,9 +21,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//upb:base", - "//upb:base_internal", "//upb:mem", "//upb:port", + "//upb/base:internal", ], ) diff --git a/upb/message/BUILD b/upb/message/BUILD index 298acd918573..76eb94c3debb 100644 --- a/upb/message/BUILD +++ b/upb/message/BUILD @@ -112,11 +112,11 @@ cc_library( ":types", ":value", "//upb:base", - "//upb:base_internal", "//upb:hash", "//upb:mem", "//upb:mini_table", "//upb:port", + "//upb/base:internal", "//upb/mini_table:internal", ], ) @@ -232,10 +232,10 @@ cc_test( "//upb:base", "//upb:mem", "//upb:mini_descriptor", - "//upb:mini_descriptor_internal", "//upb:mini_table", "//upb:port", "//upb:wire", + "//upb/mini_descriptor:internal", "//upb/test:test_messages_proto2_upb_minitable", "//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_messages_proto3_upb_minitable", @@ -302,9 +302,9 @@ cc_test( "//upb:base", "//upb:mem", "//upb:mini_descriptor", - "//upb:mini_descriptor_internal", "//upb:mini_table", "//upb:wire", + "//upb/mini_descriptor:internal", "//upb/test:test_messages_proto2_upb_proto", "//upb/test:test_messages_proto3_upb_proto", "//upb/test:test_proto_upb_minitable", diff --git a/upb/mini_descriptor/BUILD b/upb/mini_descriptor/BUILD index c4247eb01840..1857b9c338e3 100644 --- a/upb/mini_descriptor/BUILD +++ b/upb/mini_descriptor/BUILD @@ -21,10 +21,10 @@ cc_library( deps = [ ":internal", "//upb:base", - "//upb:base_internal", "//upb:mem", "//upb:mini_table", "//upb:port", + "//upb/base:internal", "//upb/mini_table:internal", ], ) @@ -47,8 +47,8 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//upb:base", - "//upb:base_internal", "//upb:port", + "//upb/base:internal", ], ) diff --git a/upb/reflection/BUILD b/upb/reflection/BUILD index 72562999b633..5854704bf6d0 100644 --- a/upb/reflection/BUILD +++ b/upb/reflection/BUILD @@ -133,7 +133,6 @@ bootstrap_cc_library( visibility = ["//visibility:public"], deps = [ "//upb:base", - "//upb:base_internal", "//upb:hash", "//upb:mem", "//upb:message", @@ -141,10 +140,11 @@ bootstrap_cc_library( "//upb:message_copy", "//upb:message_value", "//upb:mini_descriptor", - "//upb:mini_descriptor_internal", "//upb:mini_table", "//upb:port", "//upb:wire", + "//upb/base:internal", + "//upb/mini_descriptor:internal", ], )