diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 8967bacb3d..325a56bd34 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -195,13 +195,13 @@ py_extension( "//upb:base", "//upb:descriptor_upb_proto_reflection", "//upb:eps_copy_input_stream", - "//upb:hash", "//upb:message", "//upb:message_copy", "//upb:port", "//upb:reflection", "//upb:text", "//upb:wire_reader", + "//upb/hash", "//upb/util:compare", "//upb/util:def_to_proto", "//upb/util:required_fields", diff --git a/upb/BUILD b/upb/BUILD index eff6314ec9..8979c279bd 100644 --- a/upb/BUILD +++ b/upb/BUILD @@ -169,24 +169,12 @@ alias( visibility = ["//visibility:public"], ) -alias( - name = "hash", - actual = "//upb/hash", - visibility = ["//visibility:public"], -) - alias( name = "json", actual = "//upb/json", visibility = ["//visibility:public"], ) -alias( - name = "lex", - actual = "//upb/lex", - visibility = ["//visibility:public"], -) - alias( name = "mem", actual = "//upb/mem", @@ -265,12 +253,6 @@ alias( visibility = ["//visibility:public"], ) -alias( - name = "reflection_internal", - actual = "//upb/reflection:internal", - visibility = ["//visibility:public"], -) - alias( name = "text", actual = "//upb/text", @@ -333,8 +315,6 @@ upb_amalgamation( ":descriptor_upb_proto", ":eps_copy_input_stream", ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ":hash", - ":lex", ":mem", ":message", ":message_accessors", @@ -345,14 +325,16 @@ upb_amalgamation( ":mini_table_compat", ":port", ":reflection", - ":reflection_internal", ":wire", ":wire_reader", "//upb/base:internal", + "//upb/hash:hash", + "//upb/lex:lex", "//upb/mem:internal", "//upb/message:internal", "//upb/mini_descriptor:internal", "//upb/mini_table:internal", + "//upb/reflection:internal", ], strip_import_prefix = ["src"], ) @@ -378,9 +360,7 @@ upb_amalgamation( ":descriptor_upb_proto", ":eps_copy_input_stream", ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ":hash", ":json", - ":lex", ":mem", ":message", ":message_accessors", @@ -391,14 +371,16 @@ upb_amalgamation( ":mini_table_compat", ":port", ":reflection", - ":reflection_internal", ":wire", ":wire_reader", "//upb/base:internal", + "//upb/hash:hash", + "//upb/lex:lex", "//upb/mem:internal", "//upb/message:internal", "//upb/mini_descriptor:internal", "//upb/mini_table:internal", + "//upb/reflection:internal", ], prefix = "php-", strip_import_prefix = ["src"], @@ -425,9 +407,7 @@ upb_amalgamation( ":descriptor_upb_proto", ":eps_copy_input_stream", ":generated_code_support__only_for_generated_code_do_not_use__i_give_permission_to_break_me", - ":hash", ":json", - ":lex", ":mem", ":message", ":message_accessors", @@ -438,14 +418,16 @@ upb_amalgamation( ":mini_table_compat", ":port", ":reflection", - ":reflection_internal", ":wire", ":wire_reader", "//upb/base:internal", + "//upb/hash:hash", + "//upb/lex:lex", "//upb/mem:internal", "//upb/message:internal", "//upb/mini_descriptor:internal", "//upb/mini_table:internal", + "//upb/reflection:internal", ], prefix = "ruby-", strip_import_prefix = ["src"], diff --git a/upb/io/BUILD b/upb/io/BUILD index 490096a153..c1886185c2 100644 --- a/upb/io/BUILD +++ b/upb/io/BUILD @@ -19,9 +19,9 @@ cc_library( ":string", ":zero_copy_stream", "//upb:base", - "//upb:lex", "//upb:mem", "//upb:port", + "//upb/lex", ], ) @@ -79,9 +79,9 @@ cc_test( ":string", ":tokenizer", ":zero_copy_stream", - "//upb:lex", "//upb:mem", "//upb:port", + "//upb/lex", "@com_google_absl//absl/strings", "@com_google_absl//absl/strings:str_format", "@com_google_googletest//:gtest", diff --git a/upb/json/BUILD b/upb/json/BUILD index d10498fada..61461be38c 100644 --- a/upb/json/BUILD +++ b/upb/json/BUILD @@ -21,13 +21,13 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//upb:base", - "//upb:lex", "//upb:mem", "//upb:message", "//upb:mini_table", "//upb:port", "//upb:reflection", "//upb:wire", + "//upb/lex", ], ) diff --git a/upb/message/BUILD b/upb/message/BUILD index 1b10994878..6988edbc16 100644 --- a/upb/message/BUILD +++ b/upb/message/BUILD @@ -67,11 +67,11 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//upb:base", - "//upb:hash", "//upb:mem", "//upb:mini_table", "//upb:port", "//upb/base:internal", + "//upb/hash", ], ) diff --git a/upb/mini_table/BUILD b/upb/mini_table/BUILD index 221e87be83..6df9ff0b5c 100644 --- a/upb/mini_table/BUILD +++ b/upb/mini_table/BUILD @@ -30,9 +30,9 @@ cc_library( deps = [ ":internal", "//upb:base", - "//upb:hash", "//upb:mem", "//upb:port", + "//upb/hash", ], ) @@ -72,9 +72,9 @@ cc_library( deps = [ ":mini_table", "//upb:base", - "//upb:hash", "//upb:mem", "//upb:port", + "//upb/hash", ], ) diff --git a/upb/reflection/BUILD b/upb/reflection/BUILD index 9bb1b648c5..685f2d5bd2 100644 --- a/upb/reflection/BUILD +++ b/upb/reflection/BUILD @@ -133,7 +133,6 @@ bootstrap_cc_library( visibility = ["//visibility:public"], deps = [ "//upb:base", - "//upb:hash", "//upb:mem", "//upb:message", "//upb:message_accessors", @@ -143,6 +142,7 @@ bootstrap_cc_library( "//upb:port", "//upb:wire", "//upb/base:internal", + "//upb/hash", "//upb/message:internal", "//upb/mini_descriptor:internal", ], @@ -160,9 +160,9 @@ cc_library( ], visibility = ["//visibility:public"], deps = [ + ":internal", "//upb:mem", "//upb:mini_descriptor", - "//upb:reflection_internal", ], ) @@ -176,12 +176,12 @@ cc_test( ], deps = [ ":descriptor_upb_proto", + ":internal", "//upb:base", - "//upb:hash", "//upb:mem", "//upb:port", "//upb:reflection", - "//upb:reflection_internal", + "//upb/hash", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", diff --git a/upb/text/BUILD b/upb/text/BUILD index a9ba0db436..5d2418545d 100644 --- a/upb/text/BUILD +++ b/upb/text/BUILD @@ -19,12 +19,12 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//upb:eps_copy_input_stream", - "//upb:lex", "//upb:message", "//upb:port", "//upb:reflection", "//upb:wire", "//upb:wire_reader", + "//upb/lex", "//upb/message:internal", ], ) diff --git a/upb/util/BUILD b/upb/util/BUILD index e43b23959c..962f208f8e 100644 --- a/upb/util/BUILD +++ b/upb/util/BUILD @@ -20,7 +20,7 @@ cc_library( deps = [ "//upb:port", "//upb:reflection", - "//upb:reflection_internal", + "//upb/reflection:internal", ], ) @@ -53,7 +53,7 @@ cc_library( "//upb:base", "//upb:descriptor_upb_proto", "//upb:mem", - "//upb:reflection_internal", + "//upb/reflection:internal", "@com_google_googletest//:gtest", ], ) @@ -135,7 +135,7 @@ cc_test( "//upb:json", "//upb:mem", "//upb:reflection", - "//upb:reflection_internal", + "//upb/reflection:internal", "@com_google_absl//absl/strings", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", diff --git a/upb/wire/BUILD b/upb/wire/BUILD index 93be09bd9f..6a7a68b2cb 100644 --- a/upb/wire/BUILD +++ b/upb/wire/BUILD @@ -28,12 +28,12 @@ cc_library( ":reader", "//third_party/utf8_range", "//upb:base", - "//upb:hash", "//upb:mem", "//upb:message", "//upb:message_accessors", "//upb:mini_table", "//upb:port", + "//upb/hash", "//upb/mem:internal", "//upb/message:internal", "//upb/mini_table:internal", diff --git a/upb_generator/BUILD b/upb_generator/BUILD index c280281ae6..8fc302850c 100644 --- a/upb_generator/BUILD +++ b/upb_generator/BUILD @@ -243,8 +243,8 @@ cc_library( "//upb:mini_table", "//upb:port", "//upb:reflection", - "//upb:reflection_internal", "//upb:wire", + "//upb/reflection:internal", ], )