1 files changed, 271 insertions, 185 deletions
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 2694914e..26288441 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -22,154 +22,40 @@
   { "type": ["@", "rules", "data", "staged"]
   , "srcs":
     [ "well_known_protos"
-    , "any.h"
     , "any.pb.h"
     , "api.pb.h"
+    , "duration.pb.h"
+    , "empty.pb.h"
+    , "field_mask.pb.h"
+    , "source_context.pb.h"
+    , "struct.pb.h"
+    , "timestamp.pb.h"
+    , "type.pb.h"
+    , "wrappers.pb.h"
+    , "any.h"
     , "arena.h"
-    , "arenastring.h"
-    , "arenaz_sampler.h"
     , "arena_align.h"
     , "arena_allocation_policy.h"
     , "arena_cleanup.h"
-    , "arena_test_util.h"
-    , "compiler/allowlists/allowlist.h"
-    , "compiler/allowlists/allowlists.h"
-    , "compiler/annotation_test_util.h"
-    , "compiler/code_generator.h"
-    , "compiler/command_line_interface.h"
-    , "compiler/command_line_interface_tester.h"
-    , "compiler/cpp/cpp_generator.h"
-    , "compiler/cpp/enum.h"
-    , "compiler/cpp/extension.h"
-    , "compiler/cpp/field.h"
-    , "compiler/cpp/field_generators/generators.h"
-    , "compiler/cpp/file.h"
-    , "compiler/cpp/generator.h"
-    , "compiler/cpp/helpers.h"
-    , "compiler/cpp/message.h"
-    , "compiler/cpp/message_layout_helper.h"
-    , "compiler/cpp/names.h"
-    , "compiler/cpp/options.h"
-    , "compiler/cpp/padding_optimizer.h"
-    , "compiler/cpp/parse_function_generator.h"
-    , "compiler/cpp/service.h"
-    , "compiler/cpp/tracker.h"
-    , "compiler/cpp/unittest.h"
-    , "compiler/cpp/unittest.inc"
-    , "compiler/csharp/csharp_doc_comment.h"
-    , "compiler/csharp/csharp_enum.h"
-    , "compiler/csharp/csharp_enum_field.h"
-    , "compiler/csharp/csharp_field_base.h"
-    , "compiler/csharp/csharp_generator.h"
-    , "compiler/csharp/csharp_helpers.h"
-    , "compiler/csharp/csharp_map_field.h"
-    , "compiler/csharp/csharp_message.h"
-    , "compiler/csharp/csharp_message_field.h"
-    , "compiler/csharp/csharp_options.h"
-    , "compiler/csharp/csharp_primitive_field.h"
-    , "compiler/csharp/csharp_reflection_class.h"
-    , "compiler/csharp/csharp_repeated_enum_field.h"
-    , "compiler/csharp/csharp_repeated_message_field.h"
-    , "compiler/csharp/csharp_repeated_primitive_field.h"
-    , "compiler/csharp/csharp_source_generator_base.h"
-    , "compiler/csharp/csharp_wrapper_field.h"
-    , "compiler/csharp/names.h"
+    , "arenastring.h"
+    , "arenaz_sampler.h"
     , "compiler/importer.h"
-    , "compiler/java/context.h"
-    , "compiler/java/doc_comment.h"
-    , "compiler/java/enum.h"
-    , "compiler/java/enum_field.h"
-    , "compiler/java/enum_field_lite.h"
-    , "compiler/java/enum_lite.h"
-    , "compiler/java/extension.h"
-    , "compiler/java/extension_lite.h"
-    , "compiler/java/field.h"
-    , "compiler/java/file.h"
-    , "compiler/java/generator.h"
-    , "compiler/java/generator_factory.h"
-    , "compiler/java/helpers.h"
-    , "compiler/java/java_features.pb.h"
-    , "compiler/java/java_generator.h"
-    , "compiler/java/kotlin_generator.h"
-    , "compiler/java/map_field.h"
-    , "compiler/java/map_field_lite.h"
-    , "compiler/java/message.h"
-    , "compiler/java/message_builder.h"
-    , "compiler/java/message_builder_lite.h"
-    , "compiler/java/message_field.h"
-    , "compiler/java/message_field_lite.h"
-    , "compiler/java/message_lite.h"
-    , "compiler/java/message_serialization.h"
-    , "compiler/java/names.h"
-    , "compiler/java/name_resolver.h"
-    , "compiler/java/options.h"
-    , "compiler/java/primitive_field.h"
-    , "compiler/java/primitive_field_lite.h"
-    , "compiler/java/service.h"
-    , "compiler/java/shared_code_generator.h"
-    , "compiler/java/string_field.h"
-    , "compiler/java/string_field_lite.h"
-    , "compiler/mock_code_generator.h"
-    , "compiler/objectivec/enum.h"
-    , "compiler/objectivec/enum_field.h"
-    , "compiler/objectivec/extension.h"
-    , "compiler/objectivec/field.h"
-    , "compiler/objectivec/file.h"
-    , "compiler/objectivec/generator.h"
-    , "compiler/objectivec/helpers.h"
-    , "compiler/objectivec/import_writer.h"
-    , "compiler/objectivec/line_consumer.h"
-    , "compiler/objectivec/map_field.h"
-    , "compiler/objectivec/message.h"
-    , "compiler/objectivec/message_field.h"
-    , "compiler/objectivec/names.h"
-    , "compiler/objectivec/nsobject_methods.h"
-    , "compiler/objectivec/oneof.h"
-    , "compiler/objectivec/options.h"
-    , "compiler/objectivec/primitive_field.h"
-    , "compiler/objectivec/text_format_decode_data.h"
-    , "compiler/package_info.h"
     , "compiler/parser.h"
-    , "compiler/php/names.h"
-    , "compiler/php/php_generator.h"
-    , "compiler/plugin.h"
-    , "compiler/plugin.pb.h"
-    , "compiler/python/generator.h"
-    , "compiler/python/helpers.h"
-    , "compiler/python/pyi_generator.h"
-    , "compiler/python/python_generator.h"
-    , "compiler/retention.h"
-    , "compiler/ruby/ruby_generator.h"
-    , "compiler/rust/accessors/accessors.h"
-    , "compiler/rust/accessors/accessor_generator.h"
-    , "compiler/rust/context.h"
-    , "compiler/rust/generator.h"
-    , "compiler/rust/message.h"
-    , "compiler/rust/naming.h"
-    , "compiler/rust/oneof.h"
-    , "compiler/rust/relative_path.h"
-    , "compiler/scc.h"
-    , "compiler/subprocess.h"
-    , "compiler/versions.h"
-    , "compiler/versions_suffix.h"
-    , "compiler/zip_writer.h"
     , "cpp_edition_defaults.h"
     , "cpp_features.pb.h"
     , "descriptor.h"
     , "descriptor.pb.h"
     , "descriptor_database.h"
     , "descriptor_legacy.h"
+    , "descriptor_lite.h"
     , "descriptor_visitor.h"
-    , "duration.pb.h"
     , "dynamic_message.h"
-    , "empty.pb.h"
     , "endian.h"
     , "explicitly_constructed.h"
     , "extension_set.h"
     , "extension_set_inl.h"
     , "feature_resolver.h"
     , "field_access_listener.h"
-    , "field_mask.pb.h"
     , "generated_enum_reflection.h"
     , "generated_enum_util.h"
     , "generated_message_bases.h"
@@ -181,16 +67,12 @@
     , "has_bits.h"
     , "implicit_weak_message.h"
     , "inlined_string_field.h"
-    , "internal_message_util.h"
     , "internal_visibility.h"
-    , "internal_visibility_for_testing.h"
     , "io/coded_stream.h"
     , "io/gzip_stream.h"
     , "io/io_win32.h"
-    , "io/package_info.h"
     , "io/printer.h"
     , "io/strtod.h"
-    , "io/test_zero_copy_stream.h"
     , "io/tokenizer.h"
     , "io/zero_copy_sink.h"
     , "io/zero_copy_stream.h"
@@ -212,68 +94,231 @@
     , "map_field.h"
     , "map_field_inl.h"
     , "map_field_lite.h"
-    , "map_lite_test_util.h"
-    , "map_test.inc"
-    , "map_test_util.h"
-    , "map_test_util.inc"
-    , "map_test_util_impl.h"
     , "map_type_handler.h"
     , "message.h"
     , "message_lite.h"
-    , "message_unittest.inc"
     , "metadata.h"
     , "metadata_lite.h"
-    , "package_info.h"
     , "parse_context.h"
     , "port.h"
     , "port_def.inc"
     , "port_undef.inc"
-    , "proto3_lite_unittest.inc"
     , "raw_ptr.h"
     , "reflection.h"
     , "reflection_internal.h"
     , "reflection_mode.h"
     , "reflection_ops.h"
-    , "reflection_tester.h"
+    , "reflection_visit_field_info.h"
+    , "reflection_visit_fields.h"
     , "repeated_field.h"
     , "repeated_ptr_field.h"
+    , "runtime_version.h"
     , "serial_arena.h"
     , "service.h"
-    , "source_context.pb.h"
     , "string_block.h"
-    , "string_member_robber.h"
-    , "struct.pb.h"
     , "stubs/callback.h"
     , "stubs/common.h"
     , "stubs/platform_macros.h"
     , "stubs/port.h"
     , "stubs/status_macros.h"
-    , "testing/file.h"
-    , "testing/googletest.h"
-    , "test_textproto.h"
-    , "test_util.h"
-    , "test_util.inc"
-    , "test_util2.h"
-    , "test_util_lite.h"
     , "text_format.h"
     , "thread_safe_arena.h"
-    , "timestamp.pb.h"
-    , "type.pb.h"
     , "unknown_field_set.h"
     , "util/delimited_message_util.h"
     , "util/field_comparator.h"
     , "util/field_mask_util.h"
     , "util/json_util.h"
     , "util/message_differencer.h"
-    , "util/package_info.h"
     , "util/time_util.h"
     , "util/type_resolver.h"
     , "util/type_resolver_util.h"
     , "varint_shuffle.h"
     , "wire_format.h"
     , "wire_format_lite.h"
-    , "wire_format_unittest.inc"
-    , "wrappers.pb.h"
+    ]
+  , "stage": ["google", "protobuf"]
+  }
+, "protobuf_lite_headers":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs":
+    [ "any.h"
+    , "arena.h"
+    , "arena_align.h"
+    , "arena_allocation_policy.h"
+    , "arena_cleanup.h"
+    , "arenastring.h"
+    , "arenaz_sampler.h"
+    , "descriptor_lite.h"
+    , "endian.h"
+    , "explicitly_constructed.h"
+    , "extension_set.h"
+    , "extension_set_inl.h"
+    , "generated_enum_util.h"
+    , "generated_message_tctable_decl.h"
+    , "generated_message_tctable_impl.h"
+    , "generated_message_util.h"
+    , "has_bits.h"
+    , "implicit_weak_message.h"
+    , "inlined_string_field.h"
+    , "internal_visibility.h"
+    , "io/coded_stream.h"
+    , "io/io_win32.h"
+    , "io/zero_copy_stream.h"
+    , "io/zero_copy_stream_impl.h"
+    , "io/zero_copy_stream_impl_lite.h"
+    , "map.h"
+    , "map_field_lite.h"
+    , "map_type_handler.h"
+    , "message_lite.h"
+    , "metadata_lite.h"
+    , "parse_context.h"
+    , "port.h"
+    , "port_def.inc"
+    , "port_undef.inc"
+    , "raw_ptr.h"
+    , "repeated_field.h"
+    , "repeated_ptr_field.h"
+    , "runtime_version.h"
+    , "serial_arena.h"
+    , "string_block.h"
+    , "stubs/callback.h"
+    , "stubs/common.h"
+    , "stubs/platform_macros.h"
+    , "stubs/port.h"
+    , "stubs/status_macros.h"
+    , "thread_safe_arena.h"
+    , "varint_shuffle.h"
+    , "wire_format_lite.h"
+    ]
+  , "stage": ["google", "protobuf"]
+  }
+, "protoc_headers":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs":
+    [ "compiler/code_generator.h"
+    , "compiler/command_line_interface.h"
+    , "compiler/cpp/enum.h"
+    , "compiler/cpp/extension.h"
+    , "compiler/cpp/field.h"
+    , "compiler/cpp/field_generators/generators.h"
+    , "compiler/cpp/file.h"
+    , "compiler/cpp/generator.h"
+    , "compiler/cpp/helpers.h"
+    , "compiler/cpp/ifndef_guard.h"
+    , "compiler/cpp/message.h"
+    , "compiler/cpp/message_layout_helper.h"
+    , "compiler/cpp/names.h"
+    , "compiler/cpp/namespace_printer.h"
+    , "compiler/cpp/options.h"
+    , "compiler/cpp/padding_optimizer.h"
+    , "compiler/cpp/parse_function_generator.h"
+    , "compiler/cpp/service.h"
+    , "compiler/cpp/tracker.h"
+    , "compiler/csharp/csharp_doc_comment.h"
+    , "compiler/csharp/csharp_enum.h"
+    , "compiler/csharp/csharp_enum_field.h"
+    , "compiler/csharp/csharp_field_base.h"
+    , "compiler/csharp/csharp_generator.h"
+    , "compiler/csharp/csharp_helpers.h"
+    , "compiler/csharp/csharp_map_field.h"
+    , "compiler/csharp/csharp_message.h"
+    , "compiler/csharp/csharp_message_field.h"
+    , "compiler/csharp/csharp_options.h"
+    , "compiler/csharp/csharp_primitive_field.h"
+    , "compiler/csharp/csharp_reflection_class.h"
+    , "compiler/csharp/csharp_repeated_enum_field.h"
+    , "compiler/csharp/csharp_repeated_message_field.h"
+    , "compiler/csharp/csharp_repeated_primitive_field.h"
+    , "compiler/csharp/csharp_source_generator_base.h"
+    , "compiler/csharp/csharp_wrapper_field.h"
+    , "compiler/csharp/names.h"
+    , "compiler/java/context.h"
+    , "compiler/java/doc_comment.h"
+    , "compiler/java/field_common.h"
+    , "compiler/java/file.h"
+    , "compiler/java/full/enum.h"
+    , "compiler/java/full/enum_field.h"
+    , "compiler/java/full/extension.h"
+    , "compiler/java/full/field_generator.h"
+    , "compiler/java/full/generator_factory.h"
+    , "compiler/java/full/make_field_gens.h"
+    , "compiler/java/full/map_field.h"
+    , "compiler/java/full/message.h"
+    , "compiler/java/full/message_builder.h"
+    , "compiler/java/full/message_field.h"
+    , "compiler/java/full/primitive_field.h"
+    , "compiler/java/full/service.h"
+    , "compiler/java/full/string_field.h"
+    , "compiler/java/generator.h"
+    , "compiler/java/generator_common.h"
+    , "compiler/java/generator_factory.h"
+    , "compiler/java/helpers.h"
+    , "compiler/java/internal_helpers.h"
+    , "compiler/java/java_features.pb.h"
+    , "compiler/java/kotlin_generator.h"
+    , "compiler/java/lite/enum.h"
+    , "compiler/java/lite/enum_field.h"
+    , "compiler/java/lite/extension.h"
+    , "compiler/java/lite/field_generator.h"
+    , "compiler/java/lite/generator_factory.h"
+    , "compiler/java/lite/make_field_gens.h"
+    , "compiler/java/lite/map_field.h"
+    , "compiler/java/lite/message.h"
+    , "compiler/java/lite/message_builder.h"
+    , "compiler/java/lite/message_field.h"
+    , "compiler/java/lite/primitive_field.h"
+    , "compiler/java/lite/string_field.h"
+    , "compiler/java/message_serialization.h"
+    , "compiler/java/name_resolver.h"
+    , "compiler/java/names.h"
+    , "compiler/java/options.h"
+    , "compiler/java/shared_code_generator.h"
+    , "compiler/objectivec/enum.h"
+    , "compiler/objectivec/enum_field.h"
+    , "compiler/objectivec/extension.h"
+    , "compiler/objectivec/field.h"
+    , "compiler/objectivec/file.h"
+    , "compiler/objectivec/generator.h"
+    , "compiler/objectivec/helpers.h"
+    , "compiler/objectivec/import_writer.h"
+    , "compiler/objectivec/line_consumer.h"
+    , "compiler/objectivec/map_field.h"
+    , "compiler/objectivec/message.h"
+    , "compiler/objectivec/message_field.h"
+    , "compiler/objectivec/names.h"
+    , "compiler/objectivec/nsobject_methods.h"
+    , "compiler/objectivec/oneof.h"
+    , "compiler/objectivec/options.h"
+    , "compiler/objectivec/primitive_field.h"
+    , "compiler/objectivec/tf_decode_data.h"
+    , "compiler/php/names.h"
+    , "compiler/php/php_generator.h"
+    , "compiler/plugin.h"
+    , "compiler/plugin.pb.h"
+    , "compiler/python/generator.h"
+    , "compiler/python/helpers.h"
+    , "compiler/python/pyi_generator.h"
+    , "compiler/retention.h"
+    , "compiler/ruby/ruby_generator.h"
+    , "compiler/rust/accessors/accessor_case.h"
+    , "compiler/rust/accessors/accessors.h"
+    , "compiler/rust/accessors/generator.h"
+    , "compiler/rust/accessors/helpers.h"
+    , "compiler/rust/context.h"
+    , "compiler/rust/crate_mapping.h"
+    , "compiler/rust/enum.h"
+    , "compiler/rust/generator.h"
+    , "compiler/rust/message.h"
+    , "compiler/rust/naming.h"
+    , "compiler/rust/oneof.h"
+    , "compiler/rust/relative_path.h"
+    , "compiler/rust/rust_field_type.h"
+    , "compiler/rust/rust_keywords.h"
+    , "compiler/scc.h"
+    , "compiler/subprocess.h"
+    , "compiler/versions.h"
+    , "compiler/zip_writer.h"
+    , "testing/file.h"
     ]
   , "stage": ["google", "protobuf"]
   }
@@ -310,7 +355,7 @@
       , "-Wno-invalid-noreturn"
       ]
     }
-  , "hdrs": ["protobuf_headers"]
+  , "hdrs": ["protobuf_lite_headers"]
   , "srcs":
     [ "any_lite.cc"
     , "arena.cc"
@@ -340,6 +385,10 @@
     ]
   , "deps":
     [ ["@", "absl", "absl/base", "base"]
+    , ["@", "absl", "absl/base", "config"]
+    , ["@", "absl", "absl/base", "core_headers"]
+    , ["@", "absl", "absl/base", "dynamic_annotations"]
+    , ["@", "absl", "absl/base", "prefetch"]
     , ["@", "absl", "absl/container", "btree"]
     , ["@", "absl", "absl/container", "flat_hash_set"]
     , ["@", "absl", "absl/hash", "hash"]
@@ -348,9 +397,15 @@
     , ["@", "absl", "absl/meta", "type_traits"]
     , ["@", "absl", "absl/numeric", "bits"]
     , ["@", "absl", "absl/status", "status"]
+    , ["@", "absl", "absl/strings", "cord"]
     , ["@", "absl", "absl/strings", "internal"]
+    , ["@", "absl", "absl/strings", "str_format"]
+    , ["@", "absl", "absl/strings", "strings"]
     , ["@", "absl", "absl/synchronization", "synchronization"]
     , ["@", "absl", "absl/time", "time"]
+    , ["@", "absl", "absl/types", "optional"]
+    , ["@", "absl", "absl/types", "span"]
+    , ["@", "absl", "absl/utility", "if_constexpr"]
     , ["third_party/utf8_range", "utf8_validity"]
     ]
   }
@@ -394,7 +449,6 @@
     , "generated_message_util.cc"
     , "implicit_weak_message.cc"
     , "inlined_string_field.cc"
-    , "internal_message_util.cc"
     , "io/coded_stream.cc"
     , "io/gzip_stream.cc"
     , "io/io_win32.cc"
@@ -438,19 +492,34 @@
     , "wire_format_lite.cc"
     ]
   , "deps":
-    [ ["@", "absl", "absl/base", "base"]
+    [ ["@", "absl", "absl/algorithm", "container"]
+    , ["@", "absl", "absl/base", "base"]
+    , ["@", "absl", "absl/base", "core_headers"]
     , ["@", "absl", "absl/base", "dynamic_annotations"]
     , ["@", "absl", "absl/container", "btree"]
+    , ["@", "absl", "absl/container", "fixed_array"]
     , ["@", "absl", "absl/container", "flat_hash_map"]
     , ["@", "absl", "absl/container", "flat_hash_set"]
+    , ["@", "absl", "absl/functional", "any_invocable"]
+    , ["@", "absl", "absl/functional", "function_ref"]
     , ["@", "absl", "absl/hash", "hash"]
     , ["@", "absl", "absl/log", "absl_check"]
     , ["@", "absl", "absl/log", "absl_log"]
     , ["@", "absl", "absl/log", "die_if_null"]
+    , ["@", "absl", "absl/memory", "memory"]
+    , ["@", "absl", "absl/numeric", "bits"]
+    , ["@", "absl", "absl/status", "status"]
     , ["@", "absl", "absl/status", "statusor"]
+    , ["@", "absl", "absl/strings", "cord"]
     , ["@", "absl", "absl/strings", "internal"]
+    , ["@", "absl", "absl/strings", "str_format"]
+    , ["@", "absl", "absl/strings", "strings"]
     , ["@", "absl", "absl/synchronization", "synchronization"]
     , ["@", "absl", "absl/time", "time"]
+    , ["@", "absl", "absl/types", "optional"]
+    , ["@", "absl", "absl/types", "span"]
+    , ["@", "absl", "absl/types", "variant"]
+    , ["@", "absl", "absl/utility", "if_constexpr"]
     , ["@", "zlib", "", "zlib"]
     , ["", "libprotobuf_lite"]
     , ["third_party/utf8_range", "utf8_validity"]
@@ -459,13 +528,9 @@
 , "libprotoc":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["libprotoc"]
+  , "hdrs": ["protoc_headers"]
   , "srcs":
     [ "compiler/main.cc"
-    , "compiler/allowlists/editions.cc"
-    , "compiler/allowlists/empty_package.cc"
-    , "compiler/allowlists/open_enum.cc"
-    , "compiler/allowlists/unused_imports.cc"
-    , "compiler/allowlists/weak_imports.cc"
     , "compiler/code_generator.cc"
     , "compiler/command_line_interface.cc"
     , "compiler/cpp/enum.cc"
@@ -477,10 +542,13 @@
     , "compiler/cpp/field_generators/message_field.cc"
     , "compiler/cpp/field_generators/primitive_field.cc"
     , "compiler/cpp/field_generators/string_field.cc"
+    , "compiler/cpp/field_generators/string_view_field.cc"
     , "compiler/cpp/file.cc"
     , "compiler/cpp/generator.cc"
     , "compiler/cpp/helpers.cc"
+    , "compiler/cpp/ifndef_guard.cc"
     , "compiler/cpp/message.cc"
+    , "compiler/cpp/namespace_printer.cc"
     , "compiler/cpp/padding_optimizer.cc"
     , "compiler/cpp/parse_function_generator.cc"
     , "compiler/cpp/service.cc"
@@ -504,36 +572,40 @@
     , "compiler/csharp/names.cc"
     , "compiler/java/context.cc"
     , "compiler/java/doc_comment.cc"
-    , "compiler/java/enum.cc"
-    , "compiler/java/enum_field.cc"
-    , "compiler/java/enum_field_lite.cc"
-    , "compiler/java/enum_lite.cc"
-    , "compiler/java/extension.cc"
-    , "compiler/java/extension_lite.cc"
-    , "compiler/java/field.cc"
+    , "compiler/java/field_common.cc"
     , "compiler/java/file.cc"
+    , "compiler/java/full/enum.cc"
+    , "compiler/java/full/enum_field.cc"
+    , "compiler/java/full/extension.cc"
+    , "compiler/java/full/generator_factory.cc"
+    , "compiler/java/full/make_field_gens.cc"
+    , "compiler/java/full/map_field.cc"
+    , "compiler/java/full/message.cc"
+    , "compiler/java/full/message_builder.cc"
+    , "compiler/java/full/message_field.cc"
+    , "compiler/java/full/primitive_field.cc"
+    , "compiler/java/full/service.cc"
+    , "compiler/java/full/string_field.cc"
     , "compiler/java/generator.cc"
-    , "compiler/java/generator_factory.cc"
     , "compiler/java/helpers.cc"
+    , "compiler/java/internal_helpers.cc"
     , "compiler/java/java_features.pb.cc"
     , "compiler/java/kotlin_generator.cc"
-    , "compiler/java/map_field.cc"
-    , "compiler/java/map_field_lite.cc"
-    , "compiler/java/message.cc"
-    , "compiler/java/message_builder.cc"
-    , "compiler/java/message_builder_lite.cc"
-    , "compiler/java/message_field.cc"
-    , "compiler/java/message_field_lite.cc"
-    , "compiler/java/message_lite.cc"
+    , "compiler/java/lite/enum.cc"
+    , "compiler/java/lite/enum_field.cc"
+    , "compiler/java/lite/extension.cc"
+    , "compiler/java/lite/generator_factory.cc"
+    , "compiler/java/lite/make_field_gens.cc"
+    , "compiler/java/lite/map_field.cc"
+    , "compiler/java/lite/message.cc"
+    , "compiler/java/lite/message_builder.cc"
+    , "compiler/java/lite/message_field.cc"
+    , "compiler/java/lite/primitive_field.cc"
+    , "compiler/java/lite/string_field.cc"
     , "compiler/java/message_serialization.cc"
     , "compiler/java/name_resolver.cc"
     , "compiler/java/names.cc"
-    , "compiler/java/primitive_field.cc"
-    , "compiler/java/primitive_field_lite.cc"
-    , "compiler/java/service.cc"
     , "compiler/java/shared_code_generator.cc"
-    , "compiler/java/string_field.cc"
-    , "compiler/java/string_field_lite.cc"
     , "compiler/objectivec/enum.cc"
     , "compiler/objectivec/enum_field.cc"
     , "compiler/objectivec/extension.cc"
@@ -549,7 +621,7 @@
     , "compiler/objectivec/names.cc"
     , "compiler/objectivec/oneof.cc"
     , "compiler/objectivec/primitive_field.cc"
-    , "compiler/objectivec/text_format_decode_data.cc"
+    , "compiler/objectivec/tf_decode_data.cc"
     , "compiler/php/names.cc"
     , "compiler/php/php_generator.cc"
     , "compiler/plugin.cc"
@@ -559,21 +631,35 @@
     , "compiler/python/pyi_generator.cc"
     , "compiler/retention.cc"
     , "compiler/ruby/ruby_generator.cc"
+    , "compiler/rust/accessors/accessor_case.cc"
     , "compiler/rust/accessors/accessors.cc"
+    , "compiler/rust/accessors/helpers.cc"
+    , "compiler/rust/accessors/map.cc"
+    , "compiler/rust/accessors/repeated_field.cc"
     , "compiler/rust/accessors/singular_message.cc"
     , "compiler/rust/accessors/singular_scalar.cc"
     , "compiler/rust/accessors/singular_string.cc"
     , "compiler/rust/accessors/unsupported_field.cc"
     , "compiler/rust/context.cc"
+    , "compiler/rust/crate_mapping.cc"
+    , "compiler/rust/enum.cc"
     , "compiler/rust/generator.cc"
     , "compiler/rust/message.cc"
     , "compiler/rust/naming.cc"
     , "compiler/rust/oneof.cc"
     , "compiler/rust/relative_path.cc"
+    , "compiler/rust/rust_field_type.cc"
+    , "compiler/rust/rust_keywords.cc"
     , "compiler/subprocess.cc"
+    , "compiler/versions.cc"
     , "compiler/zip_writer.cc"
+    , "testing/file.cc"
+    ]
+  , "deps":
+    [ ["@", "absl", "absl/log", "initialize"]
+    , ["", "libprotobuf"]
+    , ["upb_generator", "mangle"]
     ]
-  , "deps": [["@", "absl", "absl/log", "initialize"], ["", "libprotobuf"]]
   }
 , "protoc":
   { "type": ["@", "rules", "CC", "binary"]